Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-09 13:32:54 +08:00
Code Issues Projects Releases Wiki Activity

fix NPC talk triggering main quest in 46101 (#2158)

Browse Source 
Make it so that only talks where the param matches the talkId are checked.
This commit is contained in:
Nazrin 2023-05-20 01:03:00 -07:00 committed by GitHub
parent bbd201c90e
commit 9eddd87095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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