diff options
| author | 2016-10-31 14:29:28 +0100 | |
|---|---|---|
| committer | 2016-10-31 14:29:28 +0100 | |
| commit | 97e8426698d404fd64fa832cbb63524bb6a17afb (patch) | |
| tree | d3dfceee22292c96c84df9288a37dd6145c19960 /src/main/java/cuchaz/enigma/convert | |
| parent | Fix NPE with converter when computeClassMatches (diff) | |
| download | enigma-fork-97e8426698d404fd64fa832cbb63524bb6a17afb.tar.gz enigma-fork-97e8426698d404fd64fa832cbb63524bb6a17afb.tar.xz enigma-fork-97e8426698d404fd64fa832cbb63524bb6a17afb.zip | |
Fix matcher (blame @asiekierka) + add a dirty hack for inner class inside another inner class
Diffstat (limited to 'src/main/java/cuchaz/enigma/convert')
| -rw-r--r-- | src/main/java/cuchaz/enigma/convert/ClassIdentity.java | 2 | ||||
| -rw-r--r-- | src/main/java/cuchaz/enigma/convert/MappingsConverter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java index 4d1b3ca..7360011 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java +++ b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java | |||
| @@ -58,7 +58,7 @@ public class ClassIdentity { | |||
| 58 | 58 | ||
| 59 | // classes not in the none package can be passed through | 59 | // classes not in the none package can be passed through |
| 60 | ClassEntry classEntry = new ClassEntry(className); | 60 | ClassEntry classEntry = new ClassEntry(className); |
| 61 | if (!classEntry.getClassName().contains("/")) { | 61 | if (classEntry.getPackageName() != null) { |
| 62 | return className; | 62 | return className; |
| 63 | } | 63 | } |
| 64 | 64 | ||
diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java index 01de9a5..9b06a51 100644 --- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java +++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java | |||
| @@ -235,7 +235,7 @@ public class MappingsConverter { | |||
| 235 | 235 | ||
| 236 | // non obfuscated classes can be migrated | 236 | // non obfuscated classes can be migrated |
| 237 | ClassEntry classEntry = oldObfType.getClassEntry(); | 237 | ClassEntry classEntry = oldObfType.getClassEntry(); |
| 238 | if (!classEntry.getClassName().contains("/")) { | 238 | if (classEntry.getPackageName() != null) { |
| 239 | return true; | 239 | return true; |
| 240 | } | 240 | } |
| 241 | 241 | ||