Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
dccaf59a MC-197883: Bandaid decode issue
99a1e58f Merge branch 'master' into progress/1.16.2
7470c3ef Do not let the server load chunks from newer versions (1.16.2+)
ecbc5ca0 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-08-21 20:23:12 -05:00
parent 5630d9a693
commit 1af3ae4877
7 changed files with 22 additions and 22 deletions

View File

@@ -2614,7 +2614,7 @@ index 45c142c22..6c41eb14d 100644
try {
boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 335bb1dcb..e74d21048 100644
index a0353da42..c2adc7f52 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -24,6 +24,14 @@ public class ChunkRegionLoader {
@@ -2632,7 +2632,7 @@ index 335bb1dcb..e74d21048 100644
// Paper start - guard against serializing mismatching coordinates
// TODO Note: This needs to be re-checked each update
public static ChunkCoordIntPair getChunkCoordinate(NBTTagCompound chunkData) {
@@ -374,10 +382,10 @@ public class ChunkRegionLoader {
@@ -388,10 +396,10 @@ public class ChunkRegionLoader {
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
nbttagcompound.setInt("DataVersion", SharedConstants.getGameVersion().getWorldVersion());