From 8aad6f828e7ade2232da3d4697c41b12f3acc727 Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Sun, 15 Apr 2018 08:57:57 -0600 Subject: Core/Battleground: allow Random battleground and arena queues same time. (#21730) - It also restricts queuing to arenas if it is in queue of dungeon finder --- src/server/game/Groups/Group.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Groups') diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index ef67bb36398..9c3608a0d11 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1933,7 +1933,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* if (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()) + if (bgOrTemplate->GetTypeID() == BATTLEGROUND_RB && member->InBattlegroundQueue(true)) return ERR_IN_NON_RANDOM_BG; // check for deserter debuff in case not arena queue if (bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && !member->CanJoinToBattleground(bgOrTemplate)) -- cgit v1.2.3