Merge pull request #4247 from kwvanderlinde/bugfix/4161-json-constant…

…s-are-not-json-values Fix json.* constants to keep a GSON representation
RPTools · Aug 14, 2023 · acf29bf · acf29bf
2 parents 9b061ef + 6d4afe9
commit acf29bf
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java b/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java
@@ -290,9 +290,10 @@ public Object getVariable(String name, VariableModifiers mods) throws ParserExce
 
     Object value;
 
-    if (result instanceof JsonArray) {
-      value = result;
-    } else if (result instanceof JsonObject) {
+    if (result instanceof JsonArray
+        || result instanceof JsonObject
+        || result instanceof JsonNull
+        || (result instanceof JsonPrimitive primitive && primitive.isBoolean())) {
       value = result;
     } else if (result instanceof BigDecimal) {
       value = result;