From cec71e83017bd22036a80c7747535ac3c9ee60d4 Mon Sep 17 00:00:00 2001 From: Ovah Date: Sat, 26 Feb 2022 23:18:34 +0100 Subject: Core/Quests: Do not tell the client to request questgiver details for the next quest in chain on quest reward if the player cannot accept it yet (#27816) This fixes an issue that was causing the gossip UI to get stuck when the client tried to request questgiver details that it wasnt allowed to retrieve yet --- src/server/game/Entities/Player/Player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index de466cd4b5b..7f726f8a9bd 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17428,7 +17428,8 @@ void Player::SendQuestReward(Quest const* quest, Creature const* questGiver, uin else if (questGiver->IsQuestGiver()) packet.LaunchQuest = true; else if (quest->GetNextQuestInChain() && !quest->HasFlag(QUEST_FLAGS_AUTOCOMPLETE)) - packet.UseQuestReward = true; + if (Quest const* rewardQuest = sObjectMgr->GetQuestTemplate(quest->GetNextQuestInChain())) + packet.UseQuestReward = CanTakeQuest(rewardQuest, false); } packet.HideChatMessage = hideChatMessage; -- cgit v1.2.3