summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-08-19 16:06:14 -0500
committerTravis Watkins <amaranth@ubuntu.com>2012-08-19 16:06:14 -0500
commitfeb0327d22feb285e47e7666d1d02da1b06dd289 (patch)
tree72e2cad4ee21f528b238c3458953e9211f390b7a /src
parent7dde6cc5663e1f6b84f549c54a47bc623b49fdf1 (diff)
downloadcraftbukkit-feb0327d22feb285e47e7666d1d02da1b06dd289.tar
craftbukkit-feb0327d22feb285e47e7666d1d02da1b06dd289.tar.gz
craftbukkit-feb0327d22feb285e47e7666d1d02da1b06dd289.tar.lz
craftbukkit-feb0327d22feb285e47e7666d1d02da1b06dd289.tar.xz
craftbukkit-feb0327d22feb285e47e7666d1d02da1b06dd289.zip
Check unload queue so we don't accidentally leave a chunk loaded
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/World.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3a1bdc1f..b3bdccc3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -197,7 +197,8 @@ public abstract class World implements IBlockAccess {
for (int k1 = i; k1 <= l; ++k1) {
for (int l1 = k; l1 <= j1; ++l1) {
- if (!this.isChunkLoaded(k1, l1)) {
+ // CraftBukkit - check unload queue too so we don't leak a chunk
+ if (!this.isChunkLoaded(k1, l1) || ((WorldServer) this).chunkProviderServer.unloadQueue.contains(k1, l1)) {
return false;
}
}