From 805ddb8e75361d5d0a80d290cff69527b35f1bd0 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 20 Aug 2015 18:54:08 -0400 Subject: [PATCH] Fix @Handler not properly registering for mod-added events --- src/main/java/com/enderio/core/common/Handlers.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/enderio/core/common/Handlers.java b/src/main/java/com/enderio/core/common/Handlers.java index b4a0f91..b3fe673 100644 --- a/src/main/java/com/enderio/core/common/Handlers.java +++ b/src/main/java/com/enderio/core/common/Handlers.java @@ -27,8 +27,10 @@ import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.eventhandler.SubscribeEvent; + import static com.enderio.core.common.Handlers.Handler.Inst.*; @UtilityClass @@ -230,11 +232,14 @@ public class Handlers { Class[] params = m.getParameterTypes(); if (params.length >= 1) { Class param = params[0]; - for (HandlerType type : HandlerType.values()) { - if (param.getName().contains(type.eventIdentifier)) { - types.add(type); - break; + l: while (param != Event.class && param != null && param != Object.class) { + for (HandlerType type : HandlerType.values()) { + if (param.getName().contains(type.eventIdentifier)) { + types.add(type); + break l; + } } + param = param.getSuperclass(); } } }