fix(Core/BattlegroundQueue): remove second queue if player enter bg (#…

…11067)
azerothcore · Mar 24, 2022 · 3890f5f · 3890f5f
1 parent 3961e08
commit 3890f5f
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -492,6 +492,16 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket& recvData)
         if (Battleground* currentBg = _player->GetBattleground())
             currentBg->RemovePlayerAtLeave(_player);
 
+        for (uint8 i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
+        {
+            auto playerBgQueueTypeId = _player->GetBattlegroundQueueTypeId(i);
+            if (playerBgQueueTypeId != BATTLEGROUND_QUEUE_NONE && playerBgQueueTypeId != bgQueueTypeId)
+            {
+                _player->RemoveBattlegroundQueueId(playerBgQueueTypeId);
+                sBattlegroundMgr->GetBattlegroundQueue(playerBgQueueTypeId).RemovePlayer(_player->GetGUID(), true);
+            }
+        }
+
         // Remove from LFG queues
         sLFGMgr->LeaveAllLfgQueues(_player->GetGUID(), false);