Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-07 10:36:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into questing

Browse Source
This commit is contained in:
akatatsu27
2022-07-26 14:17:42 +03:00
committed by GitHub
parent 44d8a6482e 1c5c3633d1
commit 92aeb79ac3
17 changed files with 244 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
View File

@@ -342,13 +342,10 @@ public class GameMainQuest {
ParentQuest.Builder proto = ParentQuest.newBuilder()
.setParentQuestId(getParentQuestId())
.setIsFinished(isFinished());
/**
if ParentQuestState is NONE, official server does not send ParentQuestState nor childQuestList!!!
might need more sniffing...
sending childQuestList without ParentQuestState set causes the game to hang on login
*/
if (getState() != ParentQuestState.PARENT_QUEST_STATE_NONE) {
proto.setParentQuestState(getState().getValue());
.setCutsceneEncryptionKey(QuestManager.getQuestKey(parentQuestId));
for (GameQuest quest : this.getChildQuests().values()) {
if (quest.getState() != QuestState.QUEST_STATE_UNSTARTED) {
ChildQuest childQuest = ChildQuest.newBuilder()
@@ -359,11 +356,12 @@ public class GameMainQuest {
proto.addChildQuestList(childQuest);
}
}
}
for (int i : getQuestVars()) {
proto.addQuestVar(i);
}
return proto.build();
}