From 6de4fe935d22b07fc86ce3c6291a8a9031f16559 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 28 Mar 2021 11:20:19 +0200 Subject: [PATCH] Core/Quests: fixed accepting shareable chain quests when the previous quest was completed via UI popup --- src/server/game/Handlers/QuestHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 931d396fadd..d8f1547c587 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -127,7 +127,8 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPackets::Quest::QuestG if (Player* playerQuestObject = object->ToPlayer()) { - if ((_player->GetPlayerSharingQuest() && _player->GetPlayerSharingQuest() != packet.QuestGiverGUID) || !playerQuestObject->CanShareQuest(packet.QuestID)) + if ((!_player->GetPlayerSharingQuest().IsEmpty() && _player->GetPlayerSharingQuest() != packet.QuestGiverGUID) + || (_player != playerQuestObject && !playerQuestObject->CanShareQuest(packet.QuestID))) { CLOSE_GOSSIP_CLEAR_SHARING_INFO(); return;