From 8e924724097756b5dde26c17e97b112d2f70231e Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 6 Oct 2012 21:32:41 -0400 Subject: [PATCH] Use weak references to the worlds in our maps. WorldClient would otherwise leak all over the show. --- common/net/minecraftforge/common/ForgeChunkManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/net/minecraftforge/common/ForgeChunkManager.java b/common/net/minecraftforge/common/ForgeChunkManager.java index ca5ab3462b..f025462e12 100644 --- a/common/net/minecraftforge/common/ForgeChunkManager.java +++ b/common/net/minecraftforge/common/ForgeChunkManager.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.MapMaker; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Multiset; @@ -72,7 +73,7 @@ public class ForgeChunkManager private static int defaultMaxChunks; private static boolean overridesEnabled; - private static Map> tickets = Maps.newHashMap(); + private static Map> tickets = new MapMaker().weakKeys().makeMap(); private static Map ticketConstraints = Maps.newHashMap(); private static Map chunkConstraints = Maps.newHashMap(); @@ -80,10 +81,10 @@ public class ForgeChunkManager private static Map callbacks = Maps.newHashMap(); - private static Map> forcedChunks = Maps.newHashMap(); + private static Map> forcedChunks = new MapMaker().weakKeys().makeMap(); private static BiMap pendingEntities = HashBiMap.create(); - private static Map> dormantChunkCache = Maps.newHashMap(); + private static Map> dormantChunkCache = new MapMaker().weakKeys().makeMap(); private static File cfgFile; private static Configuration config;