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 1e0b911393..554a320d56 100644 --- a/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java +++ b/src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java @@ -14,14 +14,15 @@ public class ListenerList public ListenerList() { - extendMasterList(this); - resizeLists(maxSize); + this(null); } public ListenerList(ListenerList parent) { - this(); + // parent needs to be set before resize ! this.parent = parent; + extendMasterList(this); + resizeLists(maxSize); } private synchronized static void extendMasterList(ListenerList inst)