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

Fix NPE from a boolean

Browse source
This commit is contained in:
cpw 2014-08-20 10:28:50 -04:00
parent dddbbd3bac
commit e07bd74e34
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java
View file

@ -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

3
fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
View file

@ -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)