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

Revert change made to ContentCompleteTalk

Browse Source
This commit is contained in:
KingRainbow44
2023-05-03 23:41:15 -04:00
parent f85a7cbe59
commit dae2ad394c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,11 +10,16 @@ import lombok.val;
@QuestValueContent(QUEST_CONTENT_COMPLETE_TALK) @QuestValueContent(QUEST_CONTENT_COMPLETE_TALK)
public class ContentCompleteTalk extends BaseContent { public class ContentCompleteTalk extends BaseContent {
@Override @Override
public boolean execute( public boolean execute(
GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) { GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
return condition.getParam()[0] == params[0] && val talkId = condition.getParam()[0];
GameData.getTalkConfigDataMap().get(condition.getParam()[0]) != null; val checkMainQuest = quest.getOwner().getQuestManager().getMainQuestByTalkId(talkId);
if (checkMainQuest == null) {
return false;
}
val talkData = checkMainQuest.getTalks().get(talkId);
return talkData != null;
} }
} }