Fix MappingSourceNsSwitch not dropping entries with missing destin…

…ation names
FabricMC · Sep 4, 2024 · f481000 · f481000
1 parent 6736d5f
commit f481000
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/net/fabricmc/tinyremapper/TinyUtils.java b/src/main/java/net/fabricmc/tinyremapper/TinyUtils.java
@@ -97,7 +97,8 @@ private static MappingVisitor createAdapter(String fromNs, String toNs, MappingA
 				new MappingDstNsReorder(
 						new FlatAsRegularMappingVisitor(new MappingAdapter(out)),
 						toNs),
-				fromNs);
+				fromNs,
+				true);
 	}
 
 	private static final class MappingAdapter implements FlatMappingVisitor {
@@ -108,23 +109,23 @@ private static final class MappingAdapter implements FlatMappingVisitor {
 		@Override
 		public boolean visitClass(String srcName, String[] dstNames) throws IOException {
 			String dstName = dstNames[0];
-			if (!bothNullOrEqual(srcName, dstName)) next.acceptClass(srcName, dstName);
+			if (!anyNullOrEqual(srcName, dstName)) next.acceptClass(srcName, dstName);
 			return true;
 		}
 
 		@Override
 		public boolean visitField(String srcClsName, String srcName, String srcDesc,
 				String[] dstClsNames, String[] dstNames, String[] dstDescs) throws IOException {
 			String dstName = dstNames[0];
-			if (!bothNullOrEqual(srcName, dstName)) next.acceptField(new Member(srcClsName, srcName, srcDesc), dstName);
+			if (!anyNullOrEqual(srcName, dstName)) next.acceptField(new Member(srcClsName, srcName, srcDesc), dstName);
 			return false;
 		}
 
 		@Override
 		public boolean visitMethod(String srcClsName, String srcName, String srcDesc,
 				String[] dstClsNames, String[] dstNames, String[] dstDescs) throws IOException {
 			String dstName = dstNames[0];
-			if (!bothNullOrEqual(srcName, dstName)) next.acceptMethod(new Member(srcClsName, srcName, srcDesc), dstName);
+			if (!anyNullOrEqual(srcName, dstName)) next.acceptMethod(new Member(srcClsName, srcName, srcDesc), dstName);
 			return true;
 		}
 
@@ -164,7 +165,7 @@ private static boolean firstNullOrEqual(Object o1, Object o2) {
 		return o1 == null || o1.equals(o2);
 	}
 
-	private static boolean bothNullOrEqual(Object o1, Object o2) {
+	private static boolean anyNullOrEqual(Object o1, Object o2) {
 		return o2 == null || firstNullOrEqual(o1, o2);
 	}
 }