diff options
| author | Gooyeth <566327+Gooyeth@users.noreply.github.com> | 2018-05-26 08:41:12 -0600 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2018-05-26 16:41:12 +0200 |
| commit | 5871c3675069b85d83ff8ee4b63e1be6fc9d9aea (patch) | |
| tree | 52a2a4f5634920f90458c30c569f3c8b6e6c0742 | |
| parent | e67fce6246452e7070ea6fbb01fbad7bd77f3e8f (diff) | |
Core/Battleground: Fixed a problem that did not let Arenas queue if it was in queue of Random Battleground (#21963)
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 9c3608a0d11..bf2065db0a8 100644 --- 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)) |