From a17944e91e2ceec693c8e286b4eabecbd08493c6 Mon Sep 17 00:00:00 2001 From: ModoX Date: Thu, 13 Jan 2022 20:31:51 +0100 Subject: Core/Quests: Set quest slot earlier when abandoning a quest (#27584) * fixes quest objective conditions still being true when quest is abandoned --- src/server/game/Handlers/QuestHandler.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/server/game/Handlers/QuestHandler.cpp') diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index d80a71ab2e0..3ad6d7ef9ca 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -487,6 +487,7 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPackets::Quest::QuestLogRemove } + _player->SetQuestSlot(packet.Entry, 0); _player->TakeQuestSourceItem(questId, true); // remove quest src item from player _player->AbandonQuest(questId); // remove all quest items player received before abandoning quest. Note, this does not remove normal drop items that happen to be quest requirements. _player->RemoveActiveQuest(questId); @@ -511,8 +512,6 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPackets::Quest::QuestLogRemove sScriptMgr->OnQuestStatusChange(_player, quest, oldStatus, QUEST_STATUS_NONE); } - _player->SetQuestSlot(packet.Entry, 0); - _player->UpdateCriteria(CriteriaType::AbandonAnyQuest, 1); } } -- cgit v1.2.3