Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 20:03:21 +00:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions 2023-05-20 15:45:17 +00:00
parent 4e8726d29e
commit 6d845e1cc6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/player/PlayerProgress.java
View File

@ -79,7 +79,7 @@ public class PlayerProgress {
} }
public int resetCurrentProgress(int progressId) { public int resetCurrentProgress(int progressId) {
return questProgressCountMap.merge(progressId,0,Integer::min); return questProgressCountMap.merge(progressId, 0, Integer::min);
} }
@Entity @Entity

4
src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
View File

@ -16,7 +16,7 @@ public class ContentFinishPlot extends BaseContent {
MainQuestData.TalkData talkData = MainQuestData.TalkData talkData =
quest.getMainQuest().getTalks().get(Integer.valueOf(params[0])); quest.getMainQuest().getTalks().get(Integer.valueOf(params[0]));
GameQuest subQuest = quest.getMainQuest().getChildQuestById(params[0]); GameQuest subQuest = quest.getMainQuest().getChildQuestById(params[0]);
return (talkData != null && subQuest != null return (talkData != null && subQuest != null || condition.getParamStr().equals(paramStr))
|| condition.getParamStr().equals(paramStr)) && condition.getParam()[0] == params[0]; && condition.getParam()[0] == params[0];
} }
} }