Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@31f0137 Add configurable height for slime spawn per world (#6310)
PaperMC/Paper@6f0762c Fix defaults for slime-spawn-height in paper config
PaperMC/Paper@cb198ff Fix chunk range int overflow
This commit is contained in:
BillyGalbreath
2022-01-12 04:24:04 -06:00
parent 0494fff566
commit 9723e945ab
4 changed files with 11 additions and 11 deletions

View File

@@ -2187,7 +2187,7 @@ index 38a0fb9a7c4ade9cacfd30dffabfea7e6b773981..aae2dadabedb075fd1bc712f0226882b
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 16fd37a5048ee4b2fa6760c66af6f14e8fd71f89..d2b103d94fd020295624da2eeb07653f585b586c 100644
index 0a04980a8015fe08907a040f0f3ff537267bd462..e8d9a4fc14e38d40b8a1d02752447fb98cfb4e72 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -447,7 +447,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2199,7 +2199,7 @@ index 16fd37a5048ee4b2fa6760c66af6f14e8fd71f89..d2b103d94fd020295624da2eeb07653f
// Paper start - use distance map to optimise entity tracker
this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
@@ -2356,8 +2356,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2358,8 +2358,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
}
@@ -2228,7 +2228,7 @@ index 16fd37a5048ee4b2fa6760c66af6f14e8fd71f89..d2b103d94fd020295624da2eeb07653f
Iterator iterator = this.entity.getIndirectPassengers().iterator();
while (iterator.hasNext()) {
@@ -2369,6 +2389,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2371,6 +2391,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
i = j;
}
}