added check if party members can join BG too to avoid wrong levels in…

… BG (#59)
cmangos · Aug 12, 2024 · a94253e · Exxenoz · Aug 12, 2024 · a94253e
1 parent 8ad9176
commit a94253e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/playerbot/strategy/actions/BattleGroundJoinAction.cpp b/playerbot/strategy/actions/BattleGroundJoinAction.cpp
@@ -281,7 +281,7 @@ bool BGJoinAction::gatherArenaTeam(ArenaType type)
 
         if (member->GetLevel() < 70)
         continue;
-        
+
         if (!member->GetPlayerbotAI())
             continue;
 
@@ -317,25 +317,25 @@ bool BGJoinAction::gatherArenaTeam(ArenaType type)
 }
 #endif
 
-bool BGJoinAction::canJoinBg(BattleGroundQueueTypeId queueTypeId, BattleGroundBracketId bracketId)
+bool BGJoinAction::canJoinBg(Player* player, BattleGroundQueueTypeId queueTypeId, BattleGroundBracketId bracketId)
 {
     // check if bot can join this bg/bracket
 
     BattleGroundTypeId bgTypeId = sServerFacade.BgTemplateId(queueTypeId);
 
     // check if already in queue
-    if (bot->InBattleGroundQueueForBattleGroundQueueType(queueTypeId))
+    if (player->InBattleGroundQueueForBattleGroundQueueType(queueTypeId))
         return false;
 
     // check too low/high level
-    if (!bot->GetBGAccessByLevel(bgTypeId))
+    if (!player->GetBGAccessByLevel(bgTypeId))
         return false;
 
     // check bracket
 #ifdef MANGOSBOT_TWO
     BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
     uint32 mapId = bg->GetMapId();
-    PvPDifficultyEntry const* pvpDiff = GetBattlegroundBracketByLevel(mapId, bot->GetLevel());
+    PvPDifficultyEntry const* pvpDiff = GetBattlegroundBracketByLevel(mapId, player->GetLevel());
     if (!pvpDiff)
         return false;
 
@@ -344,7 +344,7 @@ bool BGJoinAction::canJoinBg(BattleGroundQueueTypeId queueTypeId, BattleGroundBr
     if (bracket_temp != bracketId)
         return false;
 #else
-    if (bot->GetBattleGroundBracketIdFromLevel(bgTypeId) != bracketId)
+    if (player->GetBattleGroundBracketIdFromLevel(bgTypeId) != bracketId)
         return false;
 #endif
     return true;
@@ -600,7 +600,27 @@ bool BGJoinAction::isUseful()
             BattleGroundTypeId bgTypeId = sServerFacade.BgTemplateId(queueTypeId);
             BattleGroundBracketId bracketId = BattleGroundBracketId(i);
 
-            if (!canJoinBg(queueTypeId, bracketId))
+            Group* group = bot->GetGroup();
+            if (group)
+            {
+                bool partyMemberCanNotJoinBG = false;
+
+                for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
+                {
+                    Player* member = ref->getSource();
+
+                    if (!canJoinBg(member, queueTypeId, bracketId))
+                    {
+                        partyMemberCanNotJoinBG = true;
+                        break;
+                    }
+                }
+
+                if (partyMemberCanNotJoinBG)
+                    continue;
+            }
+
+            if (!canJoinBg(bot, queueTypeId, bracketId))
                 continue;
 
             if (shouldJoinBg(queueTypeId, bracketId))

diff --git a/playerbot/strategy/actions/BattleGroundJoinAction.h b/playerbot/strategy/actions/BattleGroundJoinAction.h
@@ -21,7 +21,7 @@ class BGJoinAction : public Action
     BGJoinAction(PlayerbotAI* ai, std::string name = "bg join") : Action(ai, name) {}
     virtual bool Execute(Event& event);
     virtual bool isUseful();
-    virtual bool canJoinBg(BattleGroundQueueTypeId queueTypeId, BattleGroundBracketId bracketId);
+    virtual bool canJoinBg(Player* player, BattleGroundQueueTypeId queueTypeId, BattleGroundBracketId bracketId);
     virtual bool shouldJoinBg(BattleGroundQueueTypeId queueTypeId, BattleGroundBracketId bracketId);
 #ifndef MANGOSBOT_ZERO
     virtual bool gatherArenaTeam(ArenaType type);