summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorfrymaster <frymaster@12700.org>2013-12-17 15:54:48 +0000
committerWesley Wolfe <weswolf@aol.com>2013-12-17 16:55:57 -0600
commitfbdc3a7a74fa988ea5672f9666e1bf83568c183b (patch)
tree663cd1b03ff87e739f989bca43031214cb81dc6c /src
parent0e809d83185c75afa3891255b7104a7e0949bc4e (diff)
downloadcraftbukkit-fbdc3a7a74fa988ea5672f9666e1bf83568c183b.tar
craftbukkit-fbdc3a7a74fa988ea5672f9666e1bf83568c183b.tar.gz
craftbukkit-fbdc3a7a74fa988ea5672f9666e1bf83568c183b.tar.lz
craftbukkit-fbdc3a7a74fa988ea5672f9666e1bf83568c183b.tar.xz
craftbukkit-fbdc3a7a74fa988ea5672f9666e1bf83568c183b.zip
Remove references to chunklist. Fixes BUKKIT-5190
Commit c576054539790bdeb35285f62863d74b48c0782d removed the chunklist collection stored in ChunkProviderServer, however it has been partially restored in some places by 7e1ac0a77129b169704c1e222ff2deb3ab6cd2d2. As not all references to this were restored, this has caused the chunklist and chunks collections to become out of sync, resulting in a memory leak. This commit removes chunklist from ChunkProviderServer again.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/ChunkProviderServer.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 2f842c3c..9c991774 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -30,7 +30,6 @@ public class ChunkProviderServer implements IChunkProvider {
private IChunkLoader f;
public boolean forceChunkLoad = false; // true -> false
public LongObjectHashMap<Chunk> chunks = new LongObjectHashMap<Chunk>();
- private List chunkList = new ArrayList();
public WorldServer world;
// CraftBukkit end
@@ -128,7 +127,6 @@ public class ChunkProviderServer implements IChunkProvider {
}
this.chunks.put(LongHash.toLong(i, j), chunk); // CraftBukkit
- this.chunkList.add(chunk);
chunk.addEntities();
// CraftBukkit start
@@ -305,7 +303,6 @@ public class ChunkProviderServer implements IChunkProvider {
// this.unloadQueue.remove(olong);
// this.chunks.remove(olong.longValue());
this.chunks.remove(chunkcoordinates); // CraftBukkit
- this.chunkList.remove(chunk);
}
}
// CraftBukkit end