Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 20:07:41 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)

Browse Source
This commit is contained in:
Jason Penilla 2021-10-04 22:14:11 -05:00
parent 3680f9addc
commit 0d074fcfc9
8 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch
View File

@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.loadIcon();
}
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
this.waterAmbientSpawn = this.configuration.getInt("spawn-limits.water-ambient");
this.waterUndergroundCreatureSpawn = this.configuration.getInt("spawn-limits.water-underground-creature");
this.ambientSpawn = this.configuration.getInt("spawn-limits.ambient");
this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
- TicketType.PLUGIN.timeout = this.configuration.getInt("chunk-gc.period-in-ticks");

6
patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch
View File

@ -292,6 +292,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- spawnThisTick = spawnWaterThisTick;
- limit = world.getWorld().getWaterAnimalSpawnLimit();
- break;
- case UNDERGROUND_WATER_CREATURE:
- spawnThisTick = spawnWaterUndergroundCreatureThisTick;
- limit = world.getWorld().getWaterUndergroundCreatureSpawnLimit();
- break;
- case AMBIENT:
- spawnThisTick = spawnAmbientThisTick;
- limit = world.getWorld().getAmbientSpawnLimit();
@ -304,6 +308,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ case MONSTER -> spawnThisTick = spawnMonsterThisTick;
+ case CREATURE -> spawnThisTick = spawnAnimalThisTick;
+ case WATER_CREATURE -> spawnThisTick = spawnWaterThisTick;
+ case UNDERGROUND_WATER_CREATURE -> spawnThisTick = spawnWaterUndergroundCreatureThisTick;
+ case AMBIENT -> spawnThisTick = spawnAmbientThisTick;
+ case WATER_AMBIENT -> spawnThisTick = spawnWaterAmbientThisTick;
+ // Paper end
@ -320,6 +325,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ case MONSTER -> world.getWorld().getMonsterSpawnLimit();
+ case CREATURE -> world.getWorld().getAnimalSpawnLimit();
+ case WATER_CREATURE -> world.getWorld().getWaterAnimalSpawnLimit();
+ case UNDERGROUND_WATER_CREATURE -> world.getWorld().getWaterUndergroundCreatureSpawnLimit();
+ case AMBIENT -> world.getWorld().getAmbientSpawnLimit();
+ case WATER_AMBIENT -> world.getWorld().getWaterAmbientSpawnLimit();
+ default -> enumcreaturetype.getMaxInstancesPerChunk();

2
patches/server/Adventure.patch
View File

@ -1859,8 +1859,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
private int waterAnimalSpawn = -1;
private int waterAmbientSpawn = -1;
private int waterUndergroundCreatureSpawn = -1;
private int ambientSpawn = -1;
+ private net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers

2
patches/server/Entity-Activation-Range-2.0.patch
View File

@ -323,8 +323,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public long ticksPerWaterSpawns;
public long ticksPerWaterAmbientSpawns;
public long ticksPerWaterUndergroundCreatureSpawns;
public long ticksPerAmbientSpawns;
+ // Paper start
+ public int wakeupInactiveRemainingAnimals;

13
patches/server/Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
View File

@ -18,16 +18,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.log( "Mob Spawn Range: " + this.mobSpawnRange );
}
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -0,0 +0,0 @@ settings:
spawn-limits:
monsters: 70
animals: 10
- water-animals: 15
+ water-animals: 5
water-ambient: 20
ambient: 15
chunk-gc:

2
work/Bukkit

@ -1 +1 @@
Subproject commit 19e985ecaf424e77845a8e136b7e17b94e8a65ee
Subproject commit 6be36d3638f97e6e0dc053f3e0fd0e68e8ec93f0

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit dc764e7a2f9272e72a3f37c6770c9c0f7ea83d43
Subproject commit 1df303e70742418fd30760a750a9545f3dea5b9b

2
work/Spigot

@ -1 +1 @@
Subproject commit 6c1c1b2650e2f166fbba2f670ab37af8ce20156d
Subproject commit 8e907441bde900ddc564d3a5fac831287a1a8b75