From dae2ad394ce82ccce996074eb63ca9f5ba0bbcff Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Wed, 3 May 2023 23:41:15 -0400 Subject: [PATCH] Revert change made to `ContentCompleteTalk` --- .../game/quest/content/ContentCompleteTalk.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java index c5e76d5b4..44346233b 100644 --- a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java +++ b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java @@ -10,11 +10,16 @@ import lombok.val; @QuestValueContent(QUEST_CONTENT_COMPLETE_TALK) public class ContentCompleteTalk extends BaseContent { - @Override public boolean execute( GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) { - return condition.getParam()[0] == params[0] && - GameData.getTalkConfigDataMap().get(condition.getParam()[0]) != null; + val talkId = condition.getParam()[0]; + val checkMainQuest = quest.getOwner().getQuestManager().getMainQuestByTalkId(talkId); + if (checkMainQuest == null) { + return false; + } + + val talkData = checkMainQuest.getTalks().get(talkId); + return talkData != null; } }