Merge pull request #650 from luacs1998/1.7.10

Add classloader exclusion for ASM
This commit is contained in:
LexManos 2015-04-27 15:30:09 -07:00
commit fd8c2ba08c
2 changed files with 2 additions and 0 deletions

View file

@ -16,6 +16,7 @@ public class FMLServerTweaker extends FMLTweaker {
// The mojang packages are excluded so the log4j2 queue is correctly visible from // The mojang packages are excluded so the log4j2 queue is correctly visible from
// the obfuscated and deobfuscated parts of the code. Without, the UI won't show anything // the obfuscated and deobfuscated parts of the code. Without, the UI won't show anything
classLoader.addClassLoaderExclusion("com.mojang."); classLoader.addClassLoaderExclusion("com.mojang.");
classLoader.addClassLoaderExclusion("org.objectweb.asm.");
classLoader.addTransformerExclusion("cpw.mods.fml.repackage."); classLoader.addTransformerExclusion("cpw.mods.fml.repackage.");
classLoader.addTransformerExclusion("cpw.mods.fml.relauncher."); classLoader.addTransformerExclusion("cpw.mods.fml.relauncher.");
classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers."); classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers.");

View file

@ -119,6 +119,7 @@ public class FMLTweaker implements ITweaker {
{ {
classLoader.addClassLoaderExclusion("org.apache."); classLoader.addClassLoaderExclusion("org.apache.");
classLoader.addClassLoaderExclusion("com.google.common."); classLoader.addClassLoaderExclusion("com.google.common.");
classLoader.addClassLoaderExclusion("org.objectweb.asm.");
classLoader.addTransformerExclusion("cpw.mods.fml.repackage."); classLoader.addTransformerExclusion("cpw.mods.fml.repackage.");
classLoader.addTransformerExclusion("cpw.mods.fml.relauncher."); classLoader.addTransformerExclusion("cpw.mods.fml.relauncher.");
classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers."); classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers.");