diff --git a/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java b/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java index ca9f6665a9..1e0b911393 100644 --- a/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java +++ b/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java @@ -1,11 +1,12 @@ package cpw.mods.fml.common.eventhandler; import java.util.*; +import com.google.common.collect.ImmutableList; public class ListenerList { - private static ArrayList allLists = new ArrayList(); + private static ImmutableList allLists = ImmutableList.of(); private static int maxSize = 0; private ListenerList parent; @@ -13,15 +14,22 @@ public class ListenerList public ListenerList() { - allLists.add(this); + extendMasterList(this); resizeLists(maxSize); } public ListenerList(ListenerList parent) { - allLists.add(this); + this(); this.parent = parent; - resizeLists(maxSize); + } + + private synchronized static void extendMasterList(ListenerList inst) + { + ImmutableList.Builder builder = ImmutableList.builder(); + builder.addAll(allLists); + builder.add(inst); + allLists = builder.build(); } public static void resize(int max)