From 27572359563078edacf42e7b62cf0e6f2ad4b3b2 Mon Sep 17 00:00:00 2001
From: Gooyeth <566327+Gooyeth@users.noreply.github.com>
Date: Sat, 26 May 2018 08:41:12 -0600
Subject: Core/Battleground: Fixed a problem that did not let Arenas queue if
 it was in queue of Random Battleground (#21963)

(cherry picked from commit 5871c3675069b85d83ff8ee4b63e1be6fc9d9aea)
---
 src/server/game/Groups/Group.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 0b9b825129c..b024a0bf7d5 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1846,7 +1846,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
         // don't let join if someone from the group is in bg queue random
         bool isInRandomBgQueue = member->InBattlegroundQueueForBattlegroundQueueType(BattlegroundMgr::BGQueueTypeId(BATTLEGROUND_RB, BattlegroundQueueIdType::Battleground, false, 0))
             || member->InBattlegroundQueueForBattlegroundQueueType(BattlegroundMgr::BGQueueTypeId(BATTLEGROUND_RANDOM_EPIC, BattlegroundQueueIdType::Battleground, false, 0));
-        if (isInRandomBgQueue)
+        if (bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && isInRandomBgQueue)
             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 || bgOrTemplate->GetTypeID() == BATTLEGROUND_RANDOM_EPIC) && member->InBattlegroundQueue(true) && !isInRandomBgQueue)
-- 
cgit v1.2.3