diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-13 06:41:25 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-13 06:41:25 +0200 |
| commit | 4136f3c974d2b08e1e9098fe9ab410db9a6aebd4 (patch) | |
| tree | f3755bef2fdc1613072e5112c7591263e75d5352 /src/server/game/Handlers/ArenaTeamHandler.cpp | |
| parent | cfe644b457a8262d7cd4ee613c7e05ea5b9a328b (diff) | |
| parent | db2593f41d75fb9b832f240313522d50d95f4618 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/ArenaTeamHandler.cpp
Diffstat (limited to 'src/server/game/Handlers/ArenaTeamHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ArenaTeamHandler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index 00a4c799e57..b2db2fff6c2 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -175,6 +175,12 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket& recvData) return; } + if (GetPlayer()->GetArenaTeamId(arenaTeam->GetSlot()) != arenaTeamId) + { + SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS); + return; + } + // OK result but don't send invite if (player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow())) return; |