diff options
author | md_5 <git@md-5.net> | 2016-05-11 15:34:16 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-05-11 15:34:16 +1000 |
commit | 7e9122e74d284786e1f1c4452b1ad92f51a66775 (patch) | |
tree | 33c9511eb2a50f06bdc4f500669e38f7d2496d98 /src | |
parent | c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (diff) | |
download | craftbukkit-7e9122e74d284786e1f1c4452b1ad92f51a66775.tar craftbukkit-7e9122e74d284786e1f1c4452b1ad92f51a66775.tar.gz craftbukkit-7e9122e74d284786e1f1c4452b1ad92f51a66775.tar.lz craftbukkit-7e9122e74d284786e1f1c4452b1ad92f51a66775.tar.xz craftbukkit-7e9122e74d284786e1f1c4452b1ad92f51a66775.zip |
Fix some [but not all] chunk unload issues
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 46c6f00e..11f0fb2d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -203,7 +203,7 @@ public class CraftWorld implements World { world.getChunkProviderServer().saveChunkNOP(chunk); } - world.getChunkProviderServer().unloadQueue.remove(x, z); + world.getChunkProviderServer().unloadQueue.remove(ChunkCoordIntPair.a(x, z)); world.getChunkProviderServer().chunks.remove(ChunkCoordIntPair.a(x, z)); // Update neighbor counts @@ -227,7 +227,7 @@ public class CraftWorld implements World { public boolean regenerateChunk(int x, int z) { unloadChunk0(x, z, false, false); - world.getChunkProviderServer().unloadQueue.remove(x, z); + world.getChunkProviderServer().unloadQueue.remove(ChunkCoordIntPair.a(x, z)); net.minecraft.server.Chunk chunk = null; @@ -275,7 +275,7 @@ public class CraftWorld implements World { return world.getChunkProviderServer().getChunkAt(x, z) != null; } - world.getChunkProviderServer().unloadQueue.remove(x, z); + world.getChunkProviderServer().unloadQueue.remove(ChunkCoordIntPair.a(x, z)); net.minecraft.server.Chunk chunk = world.getChunkProviderServer().chunks.get(ChunkCoordIntPair.a(x, z)); if (chunk == null) { @@ -1515,7 +1515,7 @@ public class CraftWorld implements World { } // Already unloading? - if (cps.unloadQueue.contains(chunk.locX, chunk.locZ)) { + if (cps.unloadQueue.contains(ChunkCoordIntPair.a(chunk.locX, chunk.locZ))) { continue; } |