From f13a7fc26dcd5c2867a67178371df4ad76951f6c Mon Sep 17 00:00:00 2001 From: Kneelawk Date: Sat, 25 Jun 2016 16:39:04 -0700 Subject: [PATCH] Fix NullPointerException when remapping Fix NullPointerException when remapping causing classes not to get loaded --- .../meddleapi/transformer/ReobfTransformer.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fybertech/meddleapi/transformer/ReobfTransformer.java b/src/main/java/net/fybertech/meddleapi/transformer/ReobfTransformer.java index bcb3de2..29e4cb0 100644 --- a/src/main/java/net/fybertech/meddleapi/transformer/ReobfTransformer.java +++ b/src/main/java/net/fybertech/meddleapi/transformer/ReobfTransformer.java @@ -16,6 +16,7 @@ import net.fybertech.dynamicmappings.DynamicMappings; import net.fybertech.dynamicmappings.DynamicRemap; import net.fybertech.dynamicmappings.InheritanceMap; +import net.fybertech.meddleapi.MeddleAPI; import net.minecraft.launchwrapper.IClassTransformer; public class ReobfTransformer implements IClassTransformer @@ -37,7 +38,9 @@ public class ReobfTransformer implements IClassTransformer "com.mojang.", "net.minecraft.", "oshi.", - "com.ibm." + "com.ibm.", + "com.eq2online.", + "com.mumfrey." }; @@ -109,6 +112,12 @@ public ClassNode getClassNode(String className) if (transformedCache.containsKey(className)) return transformedCache.get(className); ClassNode cn = super.getClassNode(className); + // make sure a NullPointerException is never thrown here + if (cn == null) { + MeddleAPI.LOGGER.error("Class node for " + className + " is null!"); + return null; + } + ClassWriter writer = new ClassWriter(0); cn.accept(writer);