Fix crash in MixinIntermediaryDevRemapper when trying to remap method…

…s in Object. Adapted from Fabric Loader commit 7fde9dc1f94b56bcc796264923b082c2bcfedab2, PR FabricMC/fabric-loader#746. Co-authored-by: modmuss50 <[email protected]>
architectury · Feb 7, 2023 · ad1cd4d · ad1cd4d
1 parent 3deac08
commit ad1cd4d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/dev/architectury/loom/forgeruntime/mixin/MixinIntermediaryDevRemapper.java b/src/main/java/dev/architectury/loom/forgeruntime/mixin/MixinIntermediaryDevRemapper.java
@@ -154,7 +154,7 @@ public String mapMethodName(String owner, String name, String desc) {
 				return s;
 			}
 
-			if (!classInfo.getSuperName().startsWith("java/")) {
+			if (classInfo.getSuperName() != null && !classInfo.getSuperName().startsWith("java/")) {
 				ClassInfo cSuper = classInfo.getSuperClass();
 
 				if (cSuper != null) {
@@ -221,7 +221,7 @@ public String mapFieldName(String owner, String name, String desc) {
 				return s;
 			}
 
-			if (c.getSuperName().startsWith("java/")) {
+			if (c.getSuperName() == null || c.getSuperName().startsWith("java/")) {
 				break;
 			}