diff options
| author | 2015-02-08 23:10:26 -0500 | |
|---|---|---|
| committer | 2015-02-08 23:10:26 -0500 | |
| commit | 31a1a418b04cd3e7b06cb50cb8674a2c25079f6c (patch) | |
| tree | 5914fd0c3557250dc61382a571ea3a3cdb9d941d /src/cuchaz/enigma/Deobfuscator.java | |
| parent | Merge with 09538fb039f2e4e5e240cfb331be512ae8740fda (diff) | |
| download | enigma-fork-31a1a418b04cd3e7b06cb50cb8674a2c25079f6c.tar.gz enigma-fork-31a1a418b04cd3e7b06cb50cb8674a2c25079f6c.tar.xz enigma-fork-31a1a418b04cd3e7b06cb50cb8674a2c25079f6c.zip | |
added types to fields
Diffstat (limited to 'src/cuchaz/enigma/Deobfuscator.java')
| -rw-r--r-- | src/cuchaz/enigma/Deobfuscator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java index 5f61686..818bfd4 100644 --- a/src/cuchaz/enigma/Deobfuscator.java +++ b/src/cuchaz/enigma/Deobfuscator.java | |||
| @@ -141,7 +141,7 @@ public class Deobfuscator { | |||
| 141 | 141 | ||
| 142 | // fields | 142 | // fields |
| 143 | for (FieldMapping fieldMapping : Lists.newArrayList(classMapping.fields())) { | 143 | for (FieldMapping fieldMapping : Lists.newArrayList(classMapping.fields())) { |
| 144 | FieldEntry fieldEntry = new FieldEntry(obfClassEntry, fieldMapping.getObfName()); | 144 | FieldEntry fieldEntry = new FieldEntry(obfClassEntry, fieldMapping.getObfName(), fieldMapping.getObfType()); |
| 145 | ClassEntry resolvedObfClassEntry = m_jarIndex.getTranslationIndex().resolveEntryClass(fieldEntry); | 145 | ClassEntry resolvedObfClassEntry = m_jarIndex.getTranslationIndex().resolveEntryClass(fieldEntry); |
| 146 | if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(fieldEntry.getClassEntry())) { | 146 | if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(fieldEntry.getClassEntry())) { |
| 147 | boolean wasMoved = renamer.moveFieldToObfClass(classMapping, fieldMapping, resolvedObfClassEntry); | 147 | boolean wasMoved = renamer.moveFieldToObfClass(classMapping, fieldMapping, resolvedObfClassEntry); |
| @@ -206,7 +206,7 @@ public class Deobfuscator { | |||
| 206 | 206 | ||
| 207 | // check the fields | 207 | // check the fields |
| 208 | for (FieldMapping fieldMapping : Lists.newArrayList(classMapping.fields())) { | 208 | for (FieldMapping fieldMapping : Lists.newArrayList(classMapping.fields())) { |
| 209 | FieldEntry fieldEntry = new FieldEntry(classEntry, fieldMapping.getObfName()); | 209 | FieldEntry fieldEntry = new FieldEntry(classEntry, fieldMapping.getObfName(), fieldMapping.getObfType()); |
| 210 | if (!m_jarIndex.containsObfField(fieldEntry)) { | 210 | if (!m_jarIndex.containsObfField(fieldEntry)) { |
| 211 | System.err.println("WARNING: unable to find field " + fieldEntry + ". dropping mapping."); | 211 | System.err.println("WARNING: unable to find field " + fieldEntry + ". dropping mapping."); |
| 212 | classMapping.removeFieldMapping(fieldMapping); | 212 | classMapping.removeFieldMapping(fieldMapping); |