Handle invalid skulls gracefully

onebeastchris · onebeastchris · commit 22414721ed44 · 2025-11-24T22:16:25.000+01:00
diff --git a/core/src/main/java/org/geysermc/geyser/util/JsonUtils.java b/core/src/main/java/org/geysermc/geyser/util/JsonUtils.java
@@ -49,7 +49,11 @@ public static JsonObject fromJson(InputStream stream) {
     }
 
     public static JsonObject parseJson(String s) {
-        return (JsonObject) new JsonParser().parse(s);
+        var output = new JsonParser().parse(s);
+        if (output instanceof JsonObject jsonObject) {
+            return jsonObject;
+        }
+        throw new IllegalArgumentException("Invalid JSON: " + s);
     }
 
     public static <T> T fromJson(InputStream stream, Type type) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,11 @@ public static JsonObject fromJson(InputStream stream) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public static JsonObject parseJson(String s) {`
`52`		`- return (JsonObject) new JsonParser().parse(s);`
	`52`	`+ var output = new JsonParser().parse(s);`
	`53`	`+ if (output instanceof JsonObject jsonObject) {`
	`54`	`+ return jsonObject;`
	`55`	`+ }`
	`56`	`+ throw new IllegalArgumentException("Invalid JSON: " + s);`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`public static <T> T fromJson(InputStream stream, Type type) {`