From c133e05b786ff5357931842581571c046f958c74 Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 16 Mar 2015 12:29:17 -0400 Subject: fix a zillion issues with inner classes --- src/cuchaz/enigma/Deobfuscator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/cuchaz/enigma/Deobfuscator.java') diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java index f5012bd..5a23ce5 100644 --- a/src/cuchaz/enigma/Deobfuscator.java +++ b/src/cuchaz/enigma/Deobfuscator.java @@ -438,7 +438,13 @@ public class Deobfuscator { public boolean hasDeobfuscatedName(Entry obfEntry) { Translator translator = getTranslator(TranslationDirection.Deobfuscating); if (obfEntry instanceof ClassEntry) { - return translator.translate((ClassEntry)obfEntry) != null; + ClassEntry obfClass = (ClassEntry)obfEntry; + ClassEntry translated = translator.translateEntry(obfClass); + if (obfClass.isInnerClass()) { + return !obfClass.getInnermostClassName().equals(translated.getInnermostClassName()); + } else { + return !obfClass.equals(translated); + } } else if (obfEntry instanceof FieldEntry) { return translator.translate((FieldEntry)obfEntry) != null; } else if (obfEntry instanceof MethodEntry) { -- cgit v1.2.3