keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

And make a loud message if there isn't a modcontainer found, substitute Minecraft. In general, this can only happen 

for coremods not properly registering their code. Closes #363
This commit is contained in:
Christian 2014-01-25 06:20:09 -05:00
parent e7ba3fd525
commit 92f5351cf9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java
View File

@ -6,11 +6,13 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.logging.log4j.Level;
import com.google.common.collect.MapMaker;
import com.google.common.reflect.TypeToken;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
@ -34,7 +36,13 @@ public class EventBus
return;
}
listenerOwners.put(target, Loader.instance().activeModContainer());
ModContainer activeModContainer = Loader.instance().activeModContainer();
if (activeModContainer == null)
{
FMLLog.log(Level.ERROR, new Throwable(), "Unable to determine registrant mod for %s. This is a critical error and should be impossible", target);
activeModContainer = Loader.instance().getMinecraftModContainer();
}
listenerOwners.put(target, activeModContainer);
Set<? extends Class<?>> supers = TypeToken.of(target.getClass()).getTypes().rawTypes();
for (Method method : target.getClass().getMethods())
{
@ -61,7 +69,7 @@ public class EventBus
throw new IllegalArgumentException("Method " + method + " has @SubscribeEvent annotation, but takes a argument that is not an Event " + eventType);
}
register(eventType, target, method, Loader.instance().activeModContainer());
register(eventType, target, method, activeModContainer);
break;
}
}