summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar modmuss502024-02-15 12:27:18 +0000
committerGravatar modmuss502024-02-15 12:27:18 +0000
commitaaeff9a25ef6a916067dd10d21ee2df2eeb8f16e (patch)
tree57182b8cbb941c922e95e7ef3a0feb95d615a53a
parentBump version (diff)
downloadenigma-aaeff9a25ef6a916067dd10d21ee2df2eeb8f16e.tar.gz
enigma-aaeff9a25ef6a916067dd10d21ee2df2eeb8f16e.tar.xz
enigma-aaeff9a25ef6a916067dd10d21ee2df2eeb8f16e.zip
Fix possible NPE in MappingIoConverter
-rw-r--r--build.gradle2
-rw-r--r--enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingIoConverter.java5
2 files changed, 5 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index 8c2461bf..81412dfc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ subprojects {
26 } 26 }
27 27
28 group = 'cuchaz' 28 group = 'cuchaz'
29 version = '2.4.0' 29 version = '2.4.1'
30 30
31 version = version + (System.getenv("GITHUB_ACTIONS") ? "" : "+local") 31 version = version + (System.getenv("GITHUB_ACTIONS") ? "" : "+local")
32 32
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingIoConverter.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingIoConverter.java
index 3843d8e4..b7696d2d 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingIoConverter.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingIoConverter.java
@@ -71,7 +71,10 @@ public class MappingIoConverter {
71 Deque<String> parts = new LinkedList<>(); 71 Deque<String> parts = new LinkedList<>();
72 72
73 newMappingTree.visitClass(classEntry.getFullName()); 73 newMappingTree.visitClass(classEntry.getFullName());
74 newMappingTree.visitComment(MappedElementKind.CLASS, mapping.javadoc()); 74
75 if (mapping != null) {
76 newMappingTree.visitComment(MappedElementKind.CLASS, mapping.javadoc());
77 }
75 78
76 do { 79 do {
77 mapping = oldMappingTree.get(classEntry); 80 mapping = oldMappingTree.get(classEntry);