Battleground: Fix players unable to join running battleground or too …

…many players being able to join
cmangos · Jan 21, 2025 · 5c9e15b · 5c9e15b
1 parent f0fab6b
commit 5c9e15b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/game/BattleGround/BattleGroundQueue.cpp b/src/game/BattleGround/BattleGroundQueue.cpp
@@ -786,7 +786,7 @@ void BattleGroundQueueItem::Update(BattleGroundQueue& queue, BattleGroundTypeId
     // battleground with free slot for player should be always in the beggining of the queue
     // maybe it would be better to create bgfreeslotqueue for each bracket_id
     BgFreeSlotQueueType::iterator next;
-    auto queueItems = queue.GetFreeSlotQueueItem(bgTypeId);
+    auto& queueItems = queue.GetFreeSlotQueueItem(bgTypeId);
     for (BgFreeSlotQueueType::iterator itr = queueItems.begin(); itr != queueItems.end(); itr = next)
     {
         BattleGroundInQueueInfo& queueInfo = *itr;
@@ -861,8 +861,6 @@ void BattleGroundQueueItem::Update(BattleGroundQueue& queue, BattleGroundTypeId
         bgInfo.instanceId = sMapMgr.GenerateInstanceId();
         bgInfo.m_clientInstanceId = queue.CreateClientVisibleInstanceId(bgTypeId, bracketId);
 
-        queue.AddBgToFreeSlots(bgInfo);
-
         // invite those selection pools
         for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
             for (GroupsQueueType::const_iterator citr = m_selectionPools[TEAM_INDEX_ALLIANCE + i].selectedGroups.begin(); citr != m_selectionPools[TEAM_INDEX_ALLIANCE + i].selectedGroups.end(); ++citr)
@@ -872,6 +870,8 @@ void BattleGroundQueueItem::Update(BattleGroundQueue& queue, BattleGroundTypeId
         m_selectionPools[TEAM_INDEX_ALLIANCE].Init();
         m_selectionPools[TEAM_INDEX_HORDE].Init();
 
+        queue.AddBgToFreeSlots(bgInfo);
+
         sWorld.GetMessager().AddMessage([instanceId = bgInfo.instanceId, clientInstanceId = bgInfo.m_clientInstanceId, bgTypeId, bracketId, allianceCount = bgInfo.GetInvitedCount(ALLIANCE), hordeCount = bgInfo.GetInvitedCount(HORDE)](World* world)
         {
             // create new battleground
@@ -901,13 +901,13 @@ void BattleGroundQueueItem::Update(BattleGroundQueue& queue, BattleGroundTypeId
         bgInfo.instanceId = sMapMgr.GenerateInstanceId();
         bgInfo.m_clientInstanceId = queue.CreateClientVisibleInstanceId(bgTypeId, bracketId);
 
-        queue.AddBgToFreeSlots(bgInfo);
-
         // invite those selection pools
         for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
             for (GroupsQueueType::const_iterator citr = m_selectionPools[TEAM_INDEX_ALLIANCE + i].selectedGroups.begin(); citr != m_selectionPools[TEAM_INDEX_ALLIANCE + i].selectedGroups.end(); ++citr)
                 InviteGroupToBg((*citr), bgInfo, (*citr)->groupTeam);
 
+        queue.AddBgToFreeSlots(bgInfo);
+
         sWorld.GetMessager().AddMessage([instanceId = bgInfo.instanceId, clientInstanceId = bgInfo.m_clientInstanceId, bgTypeId, bracketId, allianceCount = bgInfo.GetInvitedCount(ALLIANCE), hordeCount = bgInfo.GetInvitedCount(HORDE)](World* world)
         {
             // create new battleground