Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 18:05:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse Source
This commit is contained in:
KingRainbow44
2023-05-20 21:05:54 -04:00
parent 80dabd08d3 3c84d22dc4
commit 1515d62aa6
5 changed files with 167 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,10 @@ public class PlayerProgress {
return questProgressCountMap.merge(progressId, count, Integer::sum);
}
public int resetCurrentProgress(int progressId) {
return questProgressCountMap.merge(progressId, 0, Integer::min);
}
@Entity
@NoArgsConstructor
public static class ItemEntry {

1
src/main/java/emu/grasscutter/game/quest/GameQuest.java
View File

@@ -173,6 +173,7 @@ public class GameQuest {
finishTime = 0;
acceptTime = 0;
startTime = 0;
this.getOwner().getPlayerProgress().resetCurrentProgress(this.subQuestId);
if (oldState == QuestState.QUEST_STATE_UNSTARTED) {
return false;
}

2
src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
View File

@@ -13,7 +13,7 @@ public class ContentCompleteTalk extends BaseContent {
public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
val talkId = condition.getParam()[0];
if(talkId != params[0]) return false;
if (talkId != params[0]) return false;
val checkMainQuest = quest.getOwner().getQuestManager().getMainQuestByTalkId(talkId);
if (checkMainQuest == null) {
return false;

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 =
quest.getMainQuest().getTalks().get(Integer.valueOf(params[0]));
GameQuest subQuest = quest.getMainQuest().getChildQuestById(params[0]);
return talkData != null && subQuest != null
|| condition.getParamStr().equals(paramStr) && condition.getParam()[0] == params[0];
return (talkData != null && subQuest != null || condition.getParamStr().equals(paramStr))
&& condition.getParam()[0] == params[0];
}
}