From 0d844874124649099dbcbb9ae2b36719e1dda25f Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 27 Mar 2013 19:23:10 -0400 Subject: [PATCH] Fix up derp in access transformer --- .../cpw/mods/fml/common/asm/transformers/AccessTransformer.java | 2 +- .../common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index 814437743b..7e4e09ac5e 100644 --- a/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -159,7 +159,7 @@ public class AccessTransformer implements IClassTransformer public byte[] transform(String name, String transformedName, byte[] bytes) { if (bytes == null) { return null; } - boolean makeAllPublic = FMLDeobfuscatingRemapper.INSTANCE.isRemappedClass(name) || !name.contains("/"); + boolean makeAllPublic = FMLDeobfuscatingRemapper.INSTANCE.isRemappedClass(name); if (DEBUG) { diff --git a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 45cbf546f8..c69270e03f 100644 --- a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -125,7 +125,7 @@ public class FMLDeobfuscatingRemapper extends Remapper { public boolean isRemappedClass(String className) { - return classNameBiMap.containsKey(className) || mcpNameBiMap.containsKey(className); + return classNameBiMap.containsKey(className) || mcpNameBiMap.containsKey(className) || (!classNameBiMap.isEmpty() && className.indexOf('/') == -1); } private void parseField(String[] parts)