Grasscutter
/
Grasscutter
mirror of https://github.com/Grasscutters/Grasscutter.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix serenitea pot (#1726) 

* partial fix of serenitea pot

* fix serenitea pot
This commit is contained in:
pfyy 2022-08-31 17:13:48 +08:00 committed by GitHub
parent 7dd0c89927
commit 96caa7db17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/data/ResourceLoader.java
View File

@ -465,7 +465,7 @@ public class ResourceLoader {
}
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 @@ public class ResourceLoader {
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;
}

2
src/main/java/emu/grasscutter/data/excels/ItemData.java
View File

@ -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