diff options
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 30e80c50..0f788626 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -164,7 +164,9 @@ public class CraftWorld implements World { if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data save = true; } + chunk.removeEntities(); // Always remove entities - even if discarding, need to get them out of world table + if (save && !(chunk instanceof EmptyChunk)) { world.chunkProviderServer.saveChunk(chunk); world.chunkProviderServer.saveChunkNOP(chunk); @@ -172,7 +174,6 @@ public class CraftWorld implements World { world.chunkProviderServer.unloadQueue.remove(x, z); world.chunkProviderServer.chunks.remove(x, z); - world.chunkProviderServer.chunkList.remove(chunk); return true; } @@ -242,7 +243,6 @@ public class CraftWorld implements World { private void chunkLoadPostProcess(net.minecraft.server.Chunk chunk, int x, int z) { if (chunk != null) { world.chunkProviderServer.chunks.put(x, z, chunk); - world.chunkProviderServer.chunkList.add(chunk); chunk.addEntities(); |