diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2012-08-04 02:22:57 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2012-08-04 18:08:26 -0500 |
commit | e5acb6cf3a05e7e1d7e0256096ac5033c0e11e09 (patch) | |
tree | 6a82ce7f794f7c09323c52787f6b6a067138ea30 /src/main/java/net/minecraft/server/ChunkProviderServer.java | |
parent | fdd01feb8c3468176c4a2fc312c37da34cc0152c (diff) | |
download | craftbukkit-e5acb6cf3a05e7e1d7e0256096ac5033c0e11e09.tar craftbukkit-e5acb6cf3a05e7e1d7e0256096ac5033c0e11e09.tar.gz craftbukkit-e5acb6cf3a05e7e1d7e0256096ac5033c0e11e09.tar.lz craftbukkit-e5acb6cf3a05e7e1d7e0256096ac5033c0e11e09.tar.xz craftbukkit-e5acb6cf3a05e7e1d7e0256096ac5033c0e11e09.zip |
Don't tick chunks or entities on chunks that are queued for unload.
Treat chunks in the unload queue as if they are already unloaded to prevent
processing on them removing them from the unload queue and leaking.
Diffstat (limited to 'src/main/java/net/minecraft/server/ChunkProviderServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ChunkProviderServer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java index ace09490..3de2e480 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -23,7 +23,7 @@ public class ChunkProviderServer implements IChunkProvider { public Chunk emptyChunk; public IChunkProvider chunkProvider; // CraftBukkit private IChunkLoader e; - public boolean forceChunkLoad = false; // true -> false + public boolean forceChunkLoad = true; public LongHashtable<Chunk> chunks = new LongHashtable<Chunk>(); public List chunkList = new ArrayList(); public WorldServer world; @@ -37,7 +37,7 @@ public class ChunkProviderServer implements IChunkProvider { } public boolean isChunkLoaded(int i, int j) { - return this.chunks.containsKey(i, j); // CraftBukkit + return !this.unloadQueue.containsKey(i, j) && this.chunks.containsKey(i, j); // CraftBukkit } public void queueUnload(int i, int j) { |