From 6d4afe93a4804e1aa34d94d5234c4d7df9fe78e0 Mon Sep 17 00:00:00 2001 From: Kenneth VanderLinde Date: Tue, 20 Jun 2023 14:34:42 -0700 Subject: [PATCH] Change MapToolVariableResolver so it does not stringify any GSON values --- .../rptools/maptool/client/MapToolVariableResolver.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java b/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java index 5b138c43ce..f1489caf77 100644 --- 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;