Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Battleground/Arena: Properly check RBAC arena join permission before allowing queue. Closes #23000.

Browse Source 
(cherry picked from commit af082664ca)
This commit is contained in:
Treeston
2019-07-12 14:14:01 +02:00
committed by Shauren
parent b4b581de1b
commit a69a061d76
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Groups/Group.cpp
View File

@@ -1900,6 +1900,9 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
// offline member? don't let join
if (!member)
return ERR_BATTLEGROUND_JOIN_FAILED;
// rbac permissions
if (!member->CanJoinToBattleground(bgOrTemplate))
return ERR_BATTLEGROUND_JOIN_TIMED_OUT;
// don't allow cross-faction join as group
if (member->GetTeam() != team)
{
@@ -1925,7 +1928,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
if ((bgOrTemplate->GetTypeID() == BATTLEGROUND_RB || bgOrTemplate->GetTypeID() == BATTLEGROUND_RANDOM_EPIC) && member->InBattlegroundQueue(true) && !isInRandomBgQueue)
return ERR_IN_NON_RANDOM_BG;
// check for deserter debuff in case not arena queue
if (bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && !member->CanJoinToBattleground(bgOrTemplate))
if (bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && member->IsDeserter())
return ERR_GROUP_JOIN_BATTLEGROUND_DESERTERS;
// check if member can join any more battleground queues
if (!member->HasFreeBattlegroundQueueId())