Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix json.* constants to keep a GSON representation #4247

Merged
merged 1 commit into from
Aug 14, 2023
Merged

Fix json.* constants to keep a GSON representation #4247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading