summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/convert
diff options
context:
space:
mode:
authorGravatar Thog2016-10-17 12:10:54 +0200
committerGravatar Thog2016-10-17 12:10:54 +0200
commit06f5aca2c19d62a04e7e722f46094342feb3ed7a (patch)
treeb6b8dfae8c95b9a8c57994d426c2240c325deb73 /src/main/java/cuchaz/enigma/convert
parentRevert "apply similar fix to fields" (diff)
downloadenigma-fork-06f5aca2c19d62a04e7e722f46094342feb3ed7a.tar.gz
enigma-fork-06f5aca2c19d62a04e7e722f46094342feb3ed7a.tar.xz
enigma-fork-06f5aca2c19d62a04e7e722f46094342feb3ed7a.zip
Preparing needed things for the modification
Diffstat (limited to 'src/main/java/cuchaz/enigma/convert')
-rw-r--r--src/main/java/cuchaz/enigma/convert/MappingsConverter.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
index a80d9ce..aa80014 100644
--- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
+++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java
@@ -364,11 +364,9 @@ public class MappingsConverter {
364 public Set<BehaviorEntry> filterEntries(Collection<BehaviorEntry> obfDestFields, BehaviorEntry obfSourceField, ClassMatches classMatches) { 364 public Set<BehaviorEntry> filterEntries(Collection<BehaviorEntry> obfDestFields, BehaviorEntry obfSourceField, ClassMatches classMatches) {
365 Set<BehaviorEntry> out = Sets.newHashSet(); 365 Set<BehaviorEntry> out = Sets.newHashSet();
366 for (BehaviorEntry obfDestField : obfDestFields) { 366 for (BehaviorEntry obfDestField : obfDestFields) {
367 Signature translatedDestSignature = translate(obfDestField.getSignature(), 367 // Try to translate the signature
368 classMatches.getUniqueMatches().inverse()); 368 Signature translatedDestSignature = translate(obfDestField.getSignature(), classMatches.getUniqueMatches().inverse());
369 if ((translatedDestSignature == null && obfSourceField.getSignature() == null) 369 if (translatedDestSignature != null && obfSourceField.getSignature() != null && translatedDestSignature.equals(obfSourceField.getSignature()))
370 || translatedDestSignature != null && obfSourceField.getSignature() != null
371 && translatedDestSignature.equals(obfSourceField.getSignature()))
372 out.add(obfDestField); 370 out.add(obfDestField);
373 } 371 }
374 return out; 372 return out;