From 09c7df2bb345103a3a734b31ea2188c605bfcc49 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 20 Oct 2013 11:41:28 +0200 Subject: [PATCH] Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due to NPE. --- fml/common/cpw/mods/fml/common/FMLModContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml/common/cpw/mods/fml/common/FMLModContainer.java b/fml/common/cpw/mods/fml/common/FMLModContainer.java index 411b4594b5..6f979b4ab3 100644 --- a/fml/common/cpw/mods/fml/common/FMLModContainer.java +++ b/fml/common/cpw/mods/fml/common/FMLModContainer.java @@ -515,8 +515,8 @@ public class FMLModContainer implements ModContainer Method factoryMethod = gatherAnnotations(clazz); - isNetworkMod = FMLNetworkHandler.instance().registerNetworkMod(this, clazz, event.getASMHarvestedData()); modInstance = getLanguageAdapter().getNewInstance(this,clazz, modClassLoader, factoryMethod); + isNetworkMod = FMLNetworkHandler.instance().registerNetworkMod(this, clazz, event.getASMHarvestedData()); if (fingerprintNotPresent) { eventBus.post(new FMLFingerprintViolationEvent(source.isDirectory(), source, ImmutableSet.copyOf(this.sourceFingerprints), expectedFingerprint));