From fbdc3a7a74fa988ea5672f9666e1bf83568c183b Mon Sep 17 00:00:00 2001 From: frymaster Date: Tue, 17 Dec 2013 15:54:48 +0000 Subject: 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. --- src/main/java/net/minecraft/server/ChunkProviderServer.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') 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 chunks = new LongObjectHashMap(); - 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 -- cgit v1.2.3