Core/Battleground: Fixed a problem that did not let Arenas queue if i…

…t was in queue of Random Battleground (TrinityCore#21963)
conan513 · May 26, 2018 · 5871c36 · 5871c36
1 parent e67fce6
commit 5871c36
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
@@ -1930,7 +1930,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
         if (member->InBattlegroundQueueForBattlegroundQueueType(bgQueueTypeId))
             return ERR_BATTLEGROUND_JOIN_FAILED;            // not blizz-like
         // don't let join if someone from the group is in bg queue random
-        if (member->InBattlegroundQueueForBattlegroundQueueType(bgQueueTypeIdRandom))
+        if (bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && member->InBattlegroundQueueForBattlegroundQueueType(bgQueueTypeIdRandom))
             return ERR_IN_RANDOM_BG;
         // don't let join to bg queue random if someone from the group is already in bg queue
         if (bgOrTemplate->GetTypeID() == BATTLEGROUND_RB && member->InBattlegroundQueue(true))