From eb410af371625b218825c74114ec5064265738be Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 7 Jan 2023 14:41:12 -0500 Subject: [PATCH] sandbox is now actually sandbox again --- core/src/mindustry/io/JsonIO.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index 139be6c8c6..16059a3298 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -90,7 +90,7 @@ public class JsonIO{ @Override public Rules read(Json json, JsonValue jsonData, Class type){ - Rules out = new Rules(); + Rules out = baseObject instanceof Rules rules ? rules : new Rules(); json.readFields(out, jsonData); // Older Rules data doesn't have env mapping. @@ -354,8 +354,9 @@ public class JsonIO{ } } + private static Object baseObject; + static class CustomJson extends Json{ - private Object baseObject; { apply(this); } @@ -365,7 +366,7 @@ public class JsonIO{ } public T fromBaseJson(Class type, T base, String json){ - this.baseObject = base; + baseObject = base; return readValue(type, null, new JsonReader().parse(json)); }