From 0c18fe82f741c44df72db88bc5cf955a9cb8710c Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Tue, 5 Feb 2019 18:53:14 +0200
Subject: Fix entry remapping not applying to resolved entry

---
 .../java/cuchaz/enigma/translation/mapping/EntryRemapper.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java b/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
index 1203aba..fa421b9 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);
 		}
 	}
 
-- 
cgit v1.2.3