Fix entry remapping not applying to resolved entry

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java b/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
index 1203aba0..fa421b9f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
@@ -36,12 +36,15 @@ public class EntryRemapper {
 
         public <E extends Entry<?>> void mapFromObf(E obfuscatedEntry, @Nullable EntryMapping deobfMapping) {
                 Collection<E> resolvedEntries = obfResolver.resolveEntry(obfuscatedEntry, ResolutionStrategy.RESOLVE_ROOT);
-                for (E resolvedEntry : resolvedEntries) {
-                        if (deobfMapping != null) {
+
+                if (deobfMapping != null) {
+                        for (E resolvedEntry : resolvedEntries) {
                                 validator.validateRename(resolvedEntry, deobfMapping.getTargetName());
                         }
+                }
 
-                        obfToDeobf.insert(obfuscatedEntry, deobfMapping);
+                for (E resolvedEntry : resolvedEntries) {
+                        obfToDeobf.insert(resolvedEntry, deobfMapping);
                 }
         }