Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-26 18:45:35 +08:00
Code Issues Projects Releases Wiki Activity

Revert previous; fix data parsing issue

Browse Source
This commit is contained in:
KingRainbow44 2023-04-24 02:24:10 -04:00
parent fb686b2afc
commit 486582b81c
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/emu/grasscutter/data/binout/MainQuestData.java
View File

@ -58,17 +58,21 @@ public class MainQuestData {
} }
public void onLoad() { public void onLoad() {
this.talks = talks.stream().filter(Objects::nonNull).toList(); if (this.talks != null)
this.talks = this.talks.stream()
.filter(Objects::nonNull).toList();
Arrays.stream(this.subQuests).forEach(quest -> { Arrays.stream(this.subQuests).forEach(quest -> {
var questData = GameData.getQuestDataMap().get(quest.getSubId()); var questData = GameData.getQuestDataMap().get(quest.getSubId());
if (questData != null) if (questData != null) questData.applyFrom(quest);
questData.applyFrom(quest);
else
GameData.getQuestDataMap().put(quest.getSubId(), quest);
}); });
} }
public static class SubQuestData extends QuestData { } @Data public static class SubQuestData {
private int subId;
private int order;
private boolean isMpBlock;
private boolean isRewind, finishParent;
}
@Data @Data
@Entity @Entity