summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
diff options
context:
space:
mode:
authorGravatar asie2018-12-08 12:05:28 +0100
committerGravatar asie2018-12-08 12:05:28 +0100
commite8b2d6d19a8e7ee3ab657d5c37776ba03d43ecb7 (patch)
tree228a1974523e23f35dd1216b429ecd5dbb690cd8 /src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
parentadd barebones plugin framework, cleanup (diff)
downloadenigma-fork-e8b2d6d19a8e7ee3ab657d5c37776ba03d43ecb7.tar.gz
enigma-fork-e8b2d6d19a8e7ee3ab657d5c37776ba03d43ecb7.tar.xz
enigma-fork-e8b2d6d19a8e7ee3ab657d5c37776ba03d43ecb7.zip
rewrite entry resolution logic in TranslationIndex, hopefully fixing bugs
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java')
-rw-r--r--src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java4
1 files changed, 2 insertions, 2 deletions
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 {
92 deobfName = NameValidator.validateFieldName(deobfName); 92 deobfName = NameValidator.validateFieldName(deobfName);
93 FieldEntry targetEntry = entryPool.getField(obf.getOwnerClassEntry(), deobfName, obf.getDesc()); 93 FieldEntry targetEntry = entryPool.getField(obf.getOwnerClassEntry(), deobfName, obf.getDesc());
94 ClassEntry definedClass = null; 94 ClassEntry definedClass = null;
95 if (mappings.containsDeobfField(obf.getOwnerClassEntry(), deobfName) || index.containsEntryWithSameName(targetEntry)) 95 if (mappings.containsDeobfField(obf.getOwnerClassEntry(), deobfName) || index.containsEntryWithSameName(targetEntry)) {
96 definedClass = obf.getOwnerClassEntry(); 96 definedClass = obf.getOwnerClassEntry();
97 else { 97 } else {
98 for (ClassEntry ancestorEntry : this.index.getTranslationIndex().getAncestry(obf.getOwnerClassEntry())) { 98 for (ClassEntry ancestorEntry : this.index.getTranslationIndex().getAncestry(obf.getOwnerClassEntry())) {
99 if (mappings.containsDeobfField(ancestorEntry, deobfName) || index.containsEntryWithSameName(targetEntry.updateOwnership(ancestorEntry))) { 99 if (mappings.containsDeobfField(ancestorEntry, deobfName) || index.containsEntryWithSameName(targetEntry.updateOwnership(ancestorEntry))) {
100 definedClass = ancestorEntry; 100 definedClass = ancestorEntry;