From e8b2d6d19a8e7ee3ab657d5c37776ba03d43ecb7 Mon Sep 17 00:00:00 2001 From: asie Date: Sat, 8 Dec 2018 12:05:28 +0100 Subject: rewrite entry resolution logic in TranslationIndex, hopefully fixing bugs --- src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java') diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java index 72a12c2..8ef4f12 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java @@ -92,9 +92,9 @@ public class MappingsRenamer { deobfName = NameValidator.validateFieldName(deobfName); FieldEntry targetEntry = entryPool.getField(obf.getOwnerClassEntry(), deobfName, obf.getDesc()); ClassEntry definedClass = null; - if (mappings.containsDeobfField(obf.getOwnerClassEntry(), deobfName) || index.containsEntryWithSameName(targetEntry)) + if (mappings.containsDeobfField(obf.getOwnerClassEntry(), deobfName) || index.containsEntryWithSameName(targetEntry)) { definedClass = obf.getOwnerClassEntry(); - else { + } else { for (ClassEntry ancestorEntry : this.index.getTranslationIndex().getAncestry(obf.getOwnerClassEntry())) { if (mappings.containsDeobfField(ancestorEntry, deobfName) || index.containsEntryWithSameName(targetEntry.updateOwnership(ancestorEntry))) { definedClass = ancestorEntry; -- cgit v1.2.3