From fcc371968a1d86d0e6d0dfb1d2044f87dab73580 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 25 Feb 2022 17:35:18 -0500 Subject: [PATCH] Core/Quests: Set quest slot earlier when abandoning a quest Port From (https://github.com/TrinityCore/TrinityCore/commit/a17944e91e2ceec693c8e286b4eabecbd08493c6) --- Source/Game/Handlers/QuestHandler.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Game/Handlers/QuestHandler.cs b/Source/Game/Handlers/QuestHandler.cs index 53f37e317..90e6e3351 100644 --- a/Source/Game/Handlers/QuestHandler.cs +++ b/Source/Game/Handlers/QuestHandler.cs @@ -460,6 +460,7 @@ namespace Game } } + GetPlayer().SetQuestSlot(packet.Entry, 0); GetPlayer().TakeQuestSourceItem(questId, true); // remove quest src item from player GetPlayer().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. GetPlayer().RemoveActiveQuest(questId); @@ -473,8 +474,6 @@ namespace Game Global.ScriptMgr.OnQuestStatusChange(_player, quest, oldStatus, QuestStatus.None); } - GetPlayer().SetQuestSlot(packet.Entry, 0); - GetPlayer().UpdateCriteria(CriteriaType.AbandonAnyQuest, 1); } }