[fix] Required players to start BG

[Auntie Mangos]

What bug does the patch fix? What features does the patch add?

Implemented new (from 3.2.2a patch) feature with min required players to start bg. Also fixed a bug with wrong triggered bg premature timer.

For which repository revision was the patch created?

9765

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

http://getmangos.eu/community/showthread.php?13613

Who has been writing this patch? Please include either forum user names or email addresses.

me

diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index 5ff28cd..cfe7f55 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -150,7 +150,7 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
        if(grp->GetLeaderGUID() != _player->GetGUID())
            return;
        err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0);
-        isPremade = (grp->GetMembersCount() >= bg->GetMinPlayersPerTeam());
+        isPremade = (grp->GetMembersCount() >= bg->GetMaxPlayersPerTeam());
    }
    // if we're here, then the conditions to join a bg are met. We can proceed in joining.

diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index 84ae236..f372072 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -585,7 +585,7 @@ void BattleGroundQueue::FillPlayersToBG(BattleGround* bg, BattleGroundBracketId
// this method checks if premade versus premade battleground is possible
// then after 30 mins (default) in queue it moves premade group to normal queue
// it tries to invite as much players as it can - to MaxPlayersPerTeam, because premade groups have more than MinPlayersPerTeam players
-bool BattleGroundQueue::CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam)
+bool BattleGroundQueue::CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MaxPlayersPerTeam)
{
    //check match
    if (!m_QueuedGroups[bracket_id][bG_QUEUE_PREMADE_ALLIANCE].empty() && !m_QueuedGroups[bracket_id][bG_QUEUE_PREMADE_HORDE].empty())
@@ -630,7 +630,7 @@ bool BattleGroundQueue::CheckPremadeMatch(BattleGroundBracketId bracket_id, uint
        if (!m_QueuedGroups[bracket_id][bG_QUEUE_PREMADE_ALLIANCE + i].empty())
        {
            GroupsQueueType::iterator itr = m_QueuedGroups[bracket_id][bG_QUEUE_PREMADE_ALLIANCE + i].begin();
-            if (!(*itr)->IsInvitedToBGInstanceGUID && ((*itr)->JoinTime < time_before || (*itr)->Players.size() < MinPlayersPerTeam))
+            if (!(*itr)->IsInvitedToBGInstanceGUID && ((*itr)->JoinTime < time_before || (*itr)->Players.size() < MaxPlayersPerTeam))
            {
                //we must insert group to normal queue and erase pointer from premade queue
                m_QueuedGroups[bracket_id][bG_QUEUE_NORMAL_ALLIANCE + i].push_front((*itr));
@@ -851,7 +851,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BattleGroundBracketI
    if (bg_template->isBattleGround())
    {
        //check if there is premade against premade match
-        if (CheckPremadeMatch(bracket_id, MinPlayersPerTeam, MaxPlayersPerTeam))
+        if (CheckPremadeMatch(bracket_id, MaxPlayersPerTeam))
        {
            //create new battleground
            BattleGround * bg2 = sBattleGroundMgr.CreateNewBattleGround(bgTypeId, bracketEntry, 0, false);
@@ -876,7 +876,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BattleGroundBracketI
    if (!isRated)
    {
        // if there are enough players in pools, start new battleground or non rated arena
-        if (CheckNormalMatch(bg_template, bracket_id, MinPlayersPerTeam, MaxPlayersPerTeam)
+        if (CheckNormalMatch(bg_template, bracket_id, sBattleGroundMgr.isTesting() ? 1 : MaxPlayersPerTeam, MaxPlayersPerTeam)
            || (bg_template->isArena() && CheckSkirmishForSameFaction(bracket_id, MinPlayersPerTeam)) )
        {
            // we successfully created a pool
diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h
index 7378625..e54247c 100644
--- a/src/game/BattleGroundMgr.h
+++ b/src/game/BattleGroundMgr.h
@@ -79,7 +79,7 @@ class BattleGroundQueue
        void Update(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id, uint8 arenaType = 0, bool isRated = false, uint32 minRating = 0);

        void FillPlayersToBG(BattleGround* bg, BattleGroundBracketId bracket_id);
-        bool CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam);
+        bool CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MaxPlayersPerTeam);
        bool CheckNormalMatch(BattleGround* bg_template, BattleGroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers);
        bool CheckSkirmishForSameFaction(BattleGroundBracketId bracket_id, uint32 minPlayersPerTeam);
        GroupQueueInfo * AddGroup(Player* leader, Group* group, BattleGroundTypeId bgTypeId, PvPDifficultyEntry const*  backetEntry, uint8 ArenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 ArenaTeamId = 0);

UPDATE battleground_template SET MinPlayersPerTeam = 5 WHERE id = 2;
UPDATE battleground_template SET MinPlayersPerTeam = 10 WHERE id IN (3,7);
UPDATE battleground_template SET MinPlayersPerTeam = 15 WHERE id = 1;

patch not tested in game.

[Voldemmort]

Thanks for the patch, I'll test it tomorrow.

Do you know how to implement the max time for each BG? For example the max time in Blizz to win WG is 30 min.

[Darkruler]

Thanks for the patch, I'll test it tomorrow.

Do you know how to implement the max time for each BG? For example the max time in Blizz to win WG is 30 min.

perhaps this is what you're looking for? http://github.com/Tasssadar/Valhalla-Project/commit/74b7b5ff8be8febf07493d913bf81d2512b2121f