Fixing NPE

cjmang · cjmang · commit c38e3f31cd7e · 2025-06-19T20:37:59.000-05:00
diff --git a/src/main/java/dev/koifysh/archipelago/Client.java b/src/main/java/dev/koifysh/archipelago/Client.java
@@ -1,5 +1,6 @@
 package dev.koifysh.archipelago;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import dev.koifysh.archipelago.events.RetrievedEvent;
 import dev.koifysh.archipelago.flags.ItemsHandling;
@@ -187,8 +188,11 @@ public static String getUUID() {
                         return uuid = UUID.randomUUID().toString();
                     }
                 }
-
-                tmp = data.get("uuid").getAsString();
+                JsonElement uuidEle = data.get("uuid");
+                if(!uuidEle.isJsonNull())
+                {
+                    tmp = uuidEle.getAsString();
+                }
                 if(tmp != null)
                 {
                     return uuid = tmp;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package dev.koifysh.archipelago;`
`2`	`2`
	`3`	`+import com.google.gson.JsonElement;`
`3`	`4`	`import com.google.gson.JsonObject;`
`4`	`5`	`import dev.koifysh.archipelago.events.RetrievedEvent;`
`5`	`6`	`import dev.koifysh.archipelago.flags.ItemsHandling;`
`@@ -187,8 +188,11 @@ public static String getUUID() {`
`187`	`188`	`return uuid = UUID.randomUUID().toString();`
`188`	`189`	`}`
`189`	`190`	`}`
`190`		`-`
`191`		`- tmp = data.get("uuid").getAsString();`
	`191`	`+ JsonElement uuidEle = data.get("uuid");`
	`192`	`+ if(!uuidEle.isJsonNull())`
	`193`	`+ {`
	`194`	`+ tmp = uuidEle.getAsString();`
	`195`	`+ }`
`192`	`196`	`if(tmp != null)`
`193`	`197`	`{`
`194`	`198`	`return uuid = tmp;`