From 7648eff6db368df9c0187a57fd40265ab47b41e8 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 25 Jul 2021 14:57:15 +0200 Subject: [PATCH] Core/Quests: check if a player can take the next quest provided by its query data before trying to request its details --- src/server/game/Entities/Player/Player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a72db50bb1e..e459647717c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16519,7 +16519,8 @@ void Player::SendQuestReward(Quest const* quest, Creature const* questGiver, uin if (questGiver->IsGossip() && quest->HasFlag(QUEST_FLAGS_LAUNCH_GOSSIP_COMPLETE)) packet.LaunchGossip = true; else if (quest->GetNextQuestInChain() && !quest->HasFlag(QUEST_FLAGS_AUTOCOMPLETE)) - packet.UseQuestReward = true; + if (Quest const* quest = sObjectMgr->GetQuestTemplate(quest->GetNextQuestInChain())) + packet.UseQuestReward = CanTakeQuest(quest, false); } SendDirectMessage(packet.Write());