From e07bd74e349ea962f59eebb8a09baafd71afc0ca Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Wed, 20 Aug 2014 10:28:50 -0400
Subject: [PATCH] Fix NPE from a boolean

---
 .../main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java    | 2 +-
 fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java b/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java
index 63d13205a..0246205c2 100644
--- a/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java
+++ b/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java
@@ -42,7 +42,7 @@ public class FMLSanityChecker implements IFMLCallHook
     private static final String FORGEFINGERPRINT = "E3:C3:D5:0C:7C:98:6D:F7:4C:64:5C:0A:C5:46:39:74:1C:90:A5:57".toLowerCase().replace(":", "");
     private static final String MCFINGERPRINT =    "CD:99:95:96:56:F7:53:DC:28:D8:63:B4:67:69:F7:F8:FB:AE:FC:FC".toLowerCase().replace(":", "");
     private LaunchClassLoader cl;
-    private Boolean liveEnv;
+    private boolean liveEnv;
     public static File fmlLocation;
 
     @Override
diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java b/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
index 51fad690d..5bc5e5612 100644
--- a/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
+++ b/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
@@ -115,6 +115,7 @@ public class CoreModManager {
                 {
                     IFMLCallHook call = (IFMLCallHook) Class.forName(setupClass, true, classLoader).newInstance();
                     Map<String, Object> callData = new HashMap<String, Object>();
+                    callData.put("runtimeDeobfuscationEnabled", !deobfuscatedEnvironment);
                     callData.put("mcLocation", mcDir);
                     callData.put("classLoader", classLoader);
                     callData.put("coremodLocation", location);
@@ -249,7 +250,7 @@ public class CoreModManager {
         }
 
         ObjectArrays.concat(coreModList, ModListHelper.additionalMods.toArray(new File[0]), File.class);
-        
+
         coreModList = FileListHelper.sortFileList(coreModList);
 
         for (File coreMod : coreModList)