Data: Fix hold

Dituon · Oct 28, 2023 · 49e41d8 · 49e41d8
1 parent d1d747c
commit 49e41d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/data/xmmt.dituon.petpet/hold/data.json b/data/xmmt.dituon.petpet/hold/data.json
@@ -3,21 +3,11 @@
   "avatar": [
     {
       "type": "TO",
-      "pos": [
-        [
-          94,
-          13,
-          226,
-          132
-        ]
-      ],
+      "pos": [94, 13, 226, 132],
       "avatarOnTop": false,
       "angle": 9
     }
   ],
   "text": [],
-  "alias": [
-    "举牌",
-    "应援"
-  ]
+  "alias": ["举牌", "应援"]
 }
diff --git a/src/main/java/moe/dituon/petpet/share/AvatarModel.java b/src/main/java/moe/dituon/petpet/share/AvatarModel.java
@@ -153,6 +153,9 @@ private int[] JsonArrayToIntArray(JsonArray ja) {
         int[] result = new int[ja.size()];
         short i = 0;
         for (JsonElement je : ja) {
+            if (je instanceof JsonArray) {
+                return JsonArrayToIntArray((JsonArray) je);
+            }
             String str = ((JsonPrimitive) je).getContent();
             try {
                 result[i] = Integer.parseInt(str);