Use the proposed value on empty mappings

QuiltMC · Jan 3, 2024 · 60415e1 · 60415e1
1 parent 48643e3
commit 60415e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...in/java/org/quiltmc/enigma/api/translation/mapping/serde/enigma/EnigmaMappingsReader.java b/...in/java/org/quiltmc/enigma/api/translation/mapping/serde/enigma/EnigmaMappingsReader.java
@@ -149,8 +149,7 @@ private static void cleanMappingStack(int indentation, Deque<MappingPair<?, RawE
 		while (indentation < mappingStack.size()) {
 			MappingPair<?, RawEntryMapping> pair = mappingStack.pop();
 			if (pair.getMapping() != null) {
-				EntryMapping mapping = pair.getMapping().bake();
-				mappings.insert(pair.getEntry(), mapping.equals(EntryMapping.DEFAULT) ? null : mapping);
+				mappings.insert(pair.getEntry(), pair.getMapping().bake());
 			}
 		}
 	}

diff --git a/...src/main/java/org/quiltmc/enigma/api/translation/mapping/tree/MergedEntryMappingTree.java b/...src/main/java/org/quiltmc/enigma/api/translation/mapping/tree/MergedEntryMappingTree.java
@@ -42,7 +42,7 @@ public EntryMapping remove(Entry<?> entry) {
 	@Override
 	public EntryMapping get(Entry<?> entry) {
 		EntryMapping main = this.mainTree.get(entry);
-		if (main == null) {
+		if (main == null || main.equals(EntryMapping.DEFAULT)) {
 			return this.secondaryTree.get(entry);
 		}