From 0cd5ef6bb71cda1ef6add892d1247148bf1ecc15 Mon Sep 17 00:00:00 2001 From: cpw Date: Wed, 25 Jun 2014 09:11:07 -0400 Subject: [PATCH] Fix NPE when no FMLAT is defined --- .../cpw/mods/fml/common/asm/transformers/AccessTransformer.java | 1 + src/main/java/cpw/mods/fml/relauncher/CoreModManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index 65319be39f..d4b54440ef 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -110,6 +110,7 @@ public class AccessTransformer implements IClassTransformer { Manifest manifest = jar.getManifest(); String atList = manifest.getMainAttributes().getValue("FMLAT"); + if (atList == null) return; for (String at : atList.split(" ")) { JarEntry jarEntry = jar.getJarEntry("META-INF/"+at); diff --git a/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java b/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java index 2a7d6b62fa..f3f05a3f76 100644 --- a/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java +++ b/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java @@ -243,7 +243,7 @@ public class CoreModManager { jar = new JarFile(coreMod); if (jar.getManifest() == null) { - // Not a coremod + // Not a coremod and no access transformer list continue; } ModAccessTransformer.addJar(jar);