diff --git a/build.xml b/build.xml
index e08af069d5..6356f3ebbb 100644
--- a/build.xml
+++ b/build.xml
@@ -215,7 +215,7 @@
-
+
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 7107876797..3bbfa9491b 100644
--- a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
+++ b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
@@ -144,7 +144,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
@Override
public String mapFieldName(String owner, String name, String desc)
{
- if (classNameBiMap == null)
+ if (classNameBiMap == null || classNameBiMap.isEmpty())
{
return name;
}
@@ -155,7 +155,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
@Override
public String map(String typeName)
{
- if (classNameBiMap == null)
+ if (classNameBiMap == null || classNameBiMap.isEmpty())
{
return typeName;
}
@@ -177,7 +177,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
@Override
public String mapMethodName(String owner, String name, String desc)
{
- if (classNameBiMap==null)
+ if (classNameBiMap==null || classNameBiMap.isEmpty())
{
return name;
}
@@ -229,7 +229,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
}
public void mergeSuperMaps(String name, String superName, String[] interfaces)
{
- if (classNameBiMap == null)
+ if (classNameBiMap == null || classNameBiMap.isEmpty())
{
return;
}
diff --git a/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java b/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
index e95e79e21a..6f3bb7a157 100644
--- a/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
+++ b/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
@@ -42,16 +42,21 @@ public class RelaunchLibraryManager
try
{
// Are we in a 'decompiled' environment?
- actualClassLoader.getClassBytes("net.minecraft.world.World");
- FMLRelaunchLog.info("Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation");
- deobfuscatedEnvironment = true;
+ byte[] bs = actualClassLoader.getClassBytes("net.minecraft.world.World");
+ if (bs != null)
+ {
+ FMLRelaunchLog.info("Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation");
+ deobfuscatedEnvironment = true;
+ }
}
catch (IOException e1)
{
- FMLRelaunchLog.fine("Enabling runtime deobfuscation");
- deobfuscatedEnvironment = false;
}
+ if (!deobfuscatedEnvironment)
+ {
+ FMLRelaunchLog.fine("Enabling runtime deobfuscation");
+ }
pluginLocations = new HashMap();
loadPlugins = new ArrayList();
libraries = new ArrayList();