Fixed incorrect null handling with json apis

Fixed toJson and parseJson incorrectly handling null values in arrays
FiguraMC · Sep 17, 2023 · 7564d15 · 7564d15
1 parent 253971b
commit 7564d15
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/common/src/main/java/org/figuramc/figura/utils/JsonUtils.java b/common/src/main/java/org/figuramc/figura/utils/JsonUtils.java
@@ -40,8 +40,10 @@ public static LuaValue asLuaValue(JsonElement value) {
         } else if (value.isJsonArray()) {
             JsonArray arr = value.getAsJsonArray();
             LuaTable table = new LuaTable();
+            int i = 1;
             for (JsonElement element : arr) {
-                table.insert(table.length()+1, asLuaValue(element));
+                table.insert(i, asLuaValue(element));
+                i++;
             }
             return table;
         } else if (value.isJsonNull()) {

diff --git a/common/src/main/java/org/figuramc/figura/utils/LuaUtils.java b/common/src/main/java/org/figuramc/figura/utils/LuaUtils.java
@@ -204,8 +204,10 @@ public static JsonElement asJsonValue(LuaValue value) {
             // If it's an "array" (uses numbers as keys)
             if (checkTableArray(table)) {
                 JsonArray arr = new JsonArray();
-                for (int i = 0; i < table.length(); i++) {
-                    arr.add(asJsonValue(table.get(i+1)));
+                LuaValue[] keys = table.keys();
+                int arrayLength = keys[keys.length-1].checkint();
+                for(int i = 1; i <= arrayLength; i++) {
+                    arr.add(asJsonValue(table.get(i)));
                 }
                 return arr;
             }