From bfdabb8c378a6b37580d5138ed86523bfcde1876 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Tue, 22 Sep 2020 00:34:41 +0200 Subject: Core/Quest: Fix wrong feedback sent to the quest sharing sender with auto-accept quests. (PR #25477) Closes #25474. Co-authored-by: Treeston (cherry picked from commit e2d643f5518d256e17851243896985b2773db281) --- src/server/game/Handlers/QuestHandler.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 59b92a92300..90260a8b593 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -765,15 +765,18 @@ void WorldSession::HandlePushQuestToParty(WorldPackets::Quest::PushQuestToParty& sender->SendPushToPartyResponse(receiver, QuestPushReason::Success); - if (quest->IsAutoAccept() && receiver->CanAddQuest(quest, true) && receiver->CanTakeQuest(quest, true)) - receiver->AddQuestAndCheckCompletion(quest, sender); - if (quest->IsAutoComplete() && quest->IsRepeatable() && !quest->IsDailyOrWeekly()) receiver->PlayerTalkClass->SendQuestGiverRequestItems(quest, sender->GetGUID(), receiver->CanCompleteRepeatableQuest(quest), true); else { receiver->SetQuestSharingInfo(sender->GetGUID(), quest->GetQuestId()); receiver->PlayerTalkClass->SendQuestGiverQuestDetails(quest, receiver->GetGUID(), true, false); + if (quest->IsAutoAccept() && receiver->CanAddQuest(quest, true) && receiver->CanTakeQuest(quest, true)) + { + receiver->AddQuestAndCheckCompletion(quest, sender); + sender->SendPushToPartyResponse(receiver, QuestPushReason::Accepted); + receiver->ClearQuestSharingInfo(); + } } } } -- cgit v1.2.3