Fix refmap remapper NPE when desc is missing

Sinytra · Nov 25, 2023 · ffbb7ed · ffbb7ed
1 parent 7dd02a8
commit ffbb7ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.daemon=true
 # Versions
 versionConnector=1.0.0-beta.26
 versionAdapter=1.8.16-1.20.1-20231120.221506
-versionAdapterDefinition=1.8.18
+versionAdapterDefinition=1.8.19
 
 versionMc=1.20.1
 versionForge=47.1.3

diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/SrgRemappingReferenceMapper.java b/src/main/java/dev/su5ed/sinytra/connector/transformer/SrgRemappingReferenceMapper.java
@@ -73,7 +73,8 @@ private <T extends IMappingFile.INode> String remapRefMapEntry(Matcher matcher,
         String mappedName = node != null ? node.getMapped() : name != null ? name : "";
 
         String mappedOwner = owner != null ? this.mappingFile.remapDescriptor(owner) : "";
-        return mappedOwner + mappedName + separator + this.mappingFile.remapDescriptor(desc);
+        String mappedDesc = desc != null ? this.mappingFile.remapDescriptor(desc) : "";
+        return mappedOwner + mappedName + separator + mappedDesc;
     }
 
     public static class SimpleRefmap {