diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-02-09 22:35:20 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-02-10 21:58:07 +0100 |
| commit | 963f6699be5fc40e0368cdae493ecbf13ff41824 (patch) | |
| tree | 9a974447c1aec6e9fb0ca398df67e2368f092c2b /src/server/game/Groups/Group.cpp | |
| parent | 0edb752fea003902044865a445b5a1458369b8d3 (diff) | |
Core/Misc: Reduce code differences between branches
(cherry picked from commit afbde8800a3c9f74c3427f26ade5fd662bef9435)
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 12d11a882f3..8bb60766dd6 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1197,6 +1197,8 @@ void Group::UpdateLooterGuid(WorldObject* pLootedObject, bool ifneed) GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(BattlegroundTemplate const* bgOrTemplate, BattlegroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 /*MaxPlayerCount*/, bool isRated, uint32 arenaSlot, ObjectGuid& errorGuid) const { + errorGuid = ObjectGuid::Empty; + // check if this group is LFG group if (isLFGGroup()) return ERR_LFG_CANT_USE_BATTLEGROUND; @@ -1233,15 +1235,13 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(BattlegroundTemplate // offline member? don't let join if (!member) return ERR_BATTLEGROUND_JOIN_FAILED; + errorGuid = member->GetGUID(); // rbac permissions if (!member->CanJoinToBattleground(bgOrTemplate)) return ERR_BATTLEGROUND_JOIN_TIMED_OUT; // don't allow cross-faction join as group if (member->GetTeam() != team) - { - errorGuid = member->GetGUID(); return ERR_BATTLEGROUND_JOIN_TIMED_OUT; - } // not in the same battleground level braket, don't let join PVPDifficultyEntry const* memberBracketEntry = DB2Manager::GetBattlegroundBracketByLevel(bracketEntry->MapID, member->GetLevel()); if (memberBracketEntry != bracketEntry) @@ -1275,6 +1275,8 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(BattlegroundTemplate return ERR_BATTLEGROUND_JOIN_MERCENARY; } + errorGuid = ObjectGuid::Empty; + // only check for MinPlayerCount since MinPlayerCount == MaxPlayerCount for arenas... if (bgOrTemplate->IsArena() && memberscount != MinPlayerCount) return ERR_ARENA_TEAM_PARTY_SIZE; |