From 9eddd8709582acb364efa5bf25755b8a0d9ff7fb Mon Sep 17 00:00:00 2001 From: Nazrin Date: Sat, 20 May 2023 01:03:00 -0700 Subject: [PATCH] fix NPC talk triggering main quest in 46101 (#2158) Make it so that only talks where the param matches the talkId are checked. --- .../emu/grasscutter/game/quest/content/ContentCompleteTalk.java | 1 + 1 file changed, 1 insertion(+) 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 980a154a0..227239929 100644 --- a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java +++ b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java @@ -13,6 +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; val checkMainQuest = quest.getOwner().getQuestManager().getMainQuestByTalkId(talkId); if (checkMainQuest == null) { return false;