Merge pull request #1108 from 456dev/fix/gson-decode-number

ensure numbers where we expected booleans parse correctly.
KyoriPowered · Dec 8, 2024 · 97b1abe · 97b1abe
2 parents 18a9e9f + 4d0cb74
commit 97b1abe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonHacks.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonHacks.java
@@ -45,8 +45,10 @@ static boolean readBoolean(final JsonReader in) throws IOException {
     final JsonToken peek = in.peek();
     if (peek == JsonToken.BOOLEAN) {
       return in.nextBoolean();
-    } else if (peek == JsonToken.STRING || peek == JsonToken.NUMBER) {
+    } else if (peek == JsonToken.STRING) {
       return Boolean.parseBoolean(in.nextString());
+    } else if (peek == JsonToken.NUMBER) {
+      return in.nextString().equals("1");
     } else {
       throw new JsonParseException("Token of type " + peek + " cannot be interpreted as a boolean");
     }

diff --git a/...alizer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/StyleTest.java b/...alizer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/StyleTest.java
@@ -35,7 +35,6 @@
 import net.kyori.adventure.text.format.TextDecoration;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -95,7 +94,7 @@ void testDecoration() {
       object.addProperty(JSONComponentConstants.TEXT, "");
       object.addProperty(name(TextDecoration.BOLD), 1);
     })).style();
-    assertFalse(s0.hasDecoration(TextDecoration.BOLD));
+    assertTrue(s0.hasDecoration(TextDecoration.BOLD));
 
     assertThrows(RuntimeException.class, () -> {
       deserialize(object(object -> {