From 5115f4f1e41deebc384ad422172b0ed815f6a1d8 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 10 Jun 2012 17:19:05 -0700 Subject: [PATCH] Fixed KeyBinding issue with ModLoader container, if you register a KeyBinding twice it will discard the old one. And fixed issue where getVersion() could return null causing NPE. --- .../modloader/ModLoaderModContainer.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java index b138dad473..236f332fb3 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -573,6 +574,17 @@ public class ModLoaderModContainer implements ModContainer if (keyHandlers==null) { keyHandlers=new ArrayList(); } + + Iterator itr = keyHandlers.iterator(); + while(itr.hasNext()) + { + IKeyHandler old = itr.next(); + if (old.getKeyBinding() == handler.getKeyBinding()) + { + itr.remove(); + } + } + keyHandlers.add(handler); } @@ -637,7 +649,11 @@ public class ModLoaderModContainer implements ModContainer @Override public String getVersion() { - return mod!=null ? mod.getVersion() : "Not available"; + if (mod == null || mod.getVersion() == null) + { + return "Not available"; + } + return mod.getVersion(); } /* (non-Javadoc)