Revert: Fix bots joining bgs and ignoring amount limit

playerbot/strategy/actions/BattleGroundJoinAction.cpp

@@ -490,14 +490,9 @@ bool BGJoinAction::shouldJoinBg(BattleGroundQueueTypeId queueTypeId, BattleGroun
     if (!isArena && bot->GetGroup() && !bot->GetGroup()->IsLeader(bot->GetObjectGuid()))
         return false;
 
-    // do not join if BG queue is full
-    if (BgCount >= BracketSize && (ACount >= TeamSize) && (HCount >= TeamSize))
-    {
-        return false;
-    }
+    bool needBots = sRandomPlayerbotMgr.NeedBots[queueTypeId][bracketId][isArena ? isRated : GetTeamIndexByTeamId(bot->GetTeam())];
 
     // add more bots if players are not invited or if 1st BG instance is full
-    bool needBots = sRandomPlayerbotMgr.NeedBots[queueTypeId][bracketId][isArena ? isRated : GetTeamIndexByTeamId(bot->GetTeam())];
     if (needBots || (hasPlayers && BgCount > BracketSize && (BgCount % BracketSize) != 0))
     {
         bool needAlly = HCount >= ACount;
@@ -517,6 +512,12 @@ bool BGJoinAction::shouldJoinBg(BattleGroundQueueTypeId queueTypeId, BattleGroun
         }
     }
 
+    // do not join if BG queue is full
+    if (BgCount >= BracketSize && (ACount >= TeamSize) && (HCount >= TeamSize))
+    {
+        return false;
+    }
+
     if (!isArena && ((ACount >= TeamSize && TeamId == 0) || (HCount >= TeamSize && TeamId == 1)))
     {
         return false;
@@ -1330,6 +1331,8 @@ bool BGStatusAction::Execute(Event& event)
         // temp fix for crash
          //return true;
 
+/*
+// TO DO: Fix for wotlk
 #ifdef MANGOSBOT_TWO
         BattleGroundQueue& bgQueue = sServerFacade.bgQueue(queueTypeId);
         GroupQueueInfo ginfo;
@@ -1416,8 +1419,9 @@ bool BGStatusAction::Execute(Event& event)
             return true;
         }
 #else
+*/
         return true;
-#endif
+//#endif
     }
     if (statusid == STATUS_IN_PROGRESS) // placeholder for Leave BG if it takes too long
     {