From dad4f590f0f86d73988d0d297c94033b2bca12fb Mon Sep 17 00:00:00 2001 From: Aikar <aikar@aikar.co> Date: Sat, 4 Aug 2018 12:53:38 -0400 Subject: [PATCH] Undo a mistaken chunk registration change - Closes #1302 I misinterpreted some code as a risk of entity loss, but now after deeper study, I see how that code was used more and why it was adding entities to chunks that they shouldn't have been in during a world transfer process. --- Spigot-Server-Patches/Chunk-registration-fixes.patch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Spigot-Server-Patches/Chunk-registration-fixes.patch b/Spigot-Server-Patches/Chunk-registration-fixes.patch index 4c52703a51..f85bbeb6ab 100644 --- a/Spigot-Server-Patches/Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/Chunk-registration-fixes.patch @@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6e37c4366..ea24a6e4c 100644 +index 6e37c4366f..000d2eeb93 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { @@ -20,13 +20,4 @@ index 6e37c4366..ea24a6e4c 100644 int k = MathHelper.floor(entity.locZ / 16.0D); if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) { -@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { - this.getChunkAt(entity.ab, entity.ad).a(entity, entity.ac); - } - -- if (!entity.bD() && !this.isChunkLoaded(i, k, true)) { -+ if (false && !entity.bD() && !this.isChunkLoaded(i, k, true)) { // Paper - Always send entities into a new chunk, never lose them - entity.aa = false; - } else { - this.getChunkAt(i, k).a(entity); -- \ No newline at end of file