From 9499e6efafb808a504c594154dc8a81a1fc00ee8 Mon Sep 17 00:00:00 2001 From: Papierkorb2292 <104673791+Papierkorb2292@users.noreply.github.com> Date: Mon, 3 Feb 2025 15:33:37 +0000 Subject: [PATCH 1/2] Treat `null` input the same as input of type `JsonNull` in `JsonOps.convertTo` --- src/main/java/com/mojang/serialization/JsonOps.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mojang/serialization/JsonOps.java b/src/main/java/com/mojang/serialization/JsonOps.java index cb9ee2e6..b5ecef9c 100644 --- a/src/main/java/com/mojang/serialization/JsonOps.java +++ b/src/main/java/com/mojang/serialization/JsonOps.java @@ -44,7 +44,7 @@ public U convertTo(final DynamicOps outOps, final JsonElement input) { if (input instanceof JsonArray) { return convertList(outOps, input); } - if (input instanceof JsonNull) { + if (input instanceof JsonNull || input == null) { return outOps.empty(); } final JsonPrimitive primitive = input.getAsJsonPrimitive(); From 8d35d160799dea219d5eb5c601729a15aded324b Mon Sep 17 00:00:00 2001 From: Papierkorb2292 <104673791+Papierkorb2292@users.noreply.github.com> Date: Thu, 30 Oct 2025 08:39:53 +0100 Subject: [PATCH 2/2] Swap condition order for null check in `JsonOps.convertTo` to evaluate less unnecessary conditions Co-authored-by: Mateusz Malinkiewicz <77971310+mmalinkiewicz@users.noreply.github.com> --- src/main/java/com/mojang/serialization/JsonOps.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mojang/serialization/JsonOps.java b/src/main/java/com/mojang/serialization/JsonOps.java index b5ecef9c..d46b290b 100644 --- a/src/main/java/com/mojang/serialization/JsonOps.java +++ b/src/main/java/com/mojang/serialization/JsonOps.java @@ -44,7 +44,7 @@ public U convertTo(final DynamicOps outOps, final JsonElement input) { if (input instanceof JsonArray) { return convertList(outOps, input); } - if (input instanceof JsonNull || input == null) { + if (input == null || input instanceof JsonNull) { return outOps.empty(); } final JsonPrimitive primitive = input.getAsJsonPrimitive();