Core/Quests: skip most of the checks in CMSG_QUEST_GIVER_ACCEPT_QUEST for auto accept quests as they have been added before the cmsg comes in

1 files changed, 7 insertions, 0 deletions

diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 8b2020a98a6..ad8d8d8062c 100644
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -136,6 +136,13 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPackets::Quest::QuestG
 
     if (Quest const* quest = sObjectMgr->GetQuestTemplate(packet.QuestID))
     {
+        // Quests with QUEST_FLAGS_AUTO_ACCEPT still send this opcode despite being added already. No need to further check anything and just skip further code execution
+        if (quest->IsAutoAccept() && _player->GetQuestStatus(packet.QuestID) != QUEST_STATUS_NONE)
+        {
+            CLOSE_GOSSIP_CLEAR_SHARING_INFO();
+            return;
+        }
+
         // prevent cheating
         if (!GetPlayer()->CanTakeQuest(quest, true))
         {