fix serenitea pot (Grasscutters#1726)

* partial fix of serenitea pot * fix serenitea pot
GoJam11 · Aug 31, 2022 · 96caa7d · 96caa7d
1 parent 7dd0c89
commit 96caa7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -465,7 +465,7 @@ private static void loadHomeworldDefaultSaveData() {
             }
             try {
                 var sceneId = Integer.parseInt(matcher.group(1));
-                var data = JsonUtils.loadToClass(filename, HomeworldDefaultSaveData.class);
+                var data = JsonUtils.loadToClass(file.toString(), HomeworldDefaultSaveData.class);
                 GameData.getHomeworldDefaultSaveData().put(sceneId, data);
             } catch (Exception ignored) {}
         });
@@ -480,7 +480,7 @@ private static void loadNpcBornData() {
                 return;
             }
             try {
-                var data = JsonUtils.loadToClass(file.getFileName().toString(), SceneNpcBornData.class);
+                var data = JsonUtils.loadToClass(file.toString(), SceneNpcBornData.class);
                 if (data.getBornPosList() == null || data.getBornPosList().size() == 0) {
                     return;
                 }

diff --git a/src/main/java/emu/grasscutter/data/excels/ItemData.java b/src/main/java/emu/grasscutter/data/excels/ItemData.java
@@ -75,7 +75,7 @@ public class ItemData extends GameResource {
     private int comfort;
     private List<Integer> furnType;
     private List<Integer> furnitureGadgetID;
-    @SerializedName("JFDLJGDFIGL")
+    @SerializedName(value="OHIANNAEEAK", alternate={"DANFGGLKLNO", "JFDLJGDFIGL"})
     private int roomSceneId;
 
     // Custom