From 7818751dc3c87323bb67bc613dc3a149159717f7 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 11 Aug 2011 10:29:39 +0100 Subject: [PATCH] Fixed chunks being overwritten with empty chunks when the memory setting is immediately changed after a world loads. By: Rigby --- .../src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 8cf3dd1be..ed09f0f33 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -800,7 +800,13 @@ public class CraftWorld implements World { if (keepLoaded) { loadChunk(chunkCoordX + x, chunkCoordZ + z); } else { - unloadChunk(chunkCoordX + x, chunkCoordZ + z); + if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) { + if (this.getHandle().getChunkAt(chunkCoordX + x, chunkCoordZ + z).isEmpty()) { + unloadChunk(chunkCoordX + x, chunkCoordZ + z, false); + } else { + unloadChunk(chunkCoordX + x, chunkCoordZ + z); + } + } } } }