From 395e7b1a511131db306335c5e334dfa0565f9231 Mon Sep 17 00:00:00 2001 From: Kitten Date: Sat, 9 Jun 2018 20:02:27 +0100 Subject: [PATCH] Ensure correct class object is called for unregistration --- .../shadowfacts/forgelin/ForgelinAutomaticEventSubscriber.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/forgelin/ForgelinAutomaticEventSubscriber.kt b/src/main/kotlin/net/shadowfacts/forgelin/ForgelinAutomaticEventSubscriber.kt index 3cd4c76..dfef1f1 100644 --- a/src/main/kotlin/net/shadowfacts/forgelin/ForgelinAutomaticEventSubscriber.kt +++ b/src/main/kotlin/net/shadowfacts/forgelin/ForgelinAutomaticEventSubscriber.kt @@ -43,8 +43,9 @@ object ForgelinAutomaticEventSubscriber { LOGGER.debug("Registering @EventBusSubscriber object for {} for mod {}", subscriber.className, mod.modId) - val subscriberClass = Class.forName(subscriber.className, false, loader)?.kotlin ?: continue - val subscriberInstance = subscriberClass.objectInstance ?: subscriberClass.companionObjectInstance ?: continue + val subscriberClass = Class.forName(subscriber.className, false, loader) ?: continue + val kotlinClass = subscriberClass?.kotlin ?: continue + val subscriberInstance = kotlinClass.objectInstance ?: kotlinClass.companionObjectInstance ?: continue MinecraftForge.EVENT_BUS.unregister(subscriberClass) MinecraftForge.EVENT_BUS.register(subscriberInstance)