fix issue with removing field mappings

2 files changed, 3 insertions, 1 deletions

diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index 71332650..885400b4 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -221,6 +221,7 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         
         
         public void setFieldName(String obfName, Type obfType, String deobfName) {
+                assert(deobfName != null);
                 FieldMapping fieldMapping = m_fieldsByObf.get(getFieldKey(obfName, obfType));
                 if (fieldMapping == null) {
                         fieldMapping = new FieldMapping(obfName, obfType, deobfName);
@@ -316,6 +317,7 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         //// ARGUMENTS ////////
         
         public void setArgumentName(String obfMethodName, Signature obfMethodSignature, int argumentIndex, String argumentName) {
+                assert(argumentName != null);
                 MethodMapping methodMapping = m_methodsByObf.get(getMethodKey(obfMethodName, obfMethodSignature));
                 if (methodMapping == null) {
                         methodMapping = createMethodMapping(obfMethodName, obfMethodSignature);
diff --git a/src/cuchaz/enigma/mapping/MappingsRenamer.java b/src/cuchaz/enigma/mapping/MappingsRenamer.java
index 095e5e9a..ea343c4e 100644
--- a/src/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -87,7 +87,7 @@ public class MappingsRenamer {
         
         public void removeFieldMapping(FieldEntry obf) {
                 ClassMapping classMapping = getClassMappingOrInnerClassMapping(obf.getClassEntry());
-                classMapping.setFieldName(obf.getName(), obf.getType(), null);
+                classMapping.removeFieldMapping(classMapping.getFieldByObf(obf.getName(), obf.getType()));
         }
         
         public void markFieldAsDeobfuscated(FieldEntry obf) {