diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-08-21 23:59:00 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-08-21 23:59:00 +0200 |
| commit | 42cac6796abbc683f8d383b43750860f05bb2dc6 (patch) | |
| tree | 5984c512c709feca55efce941aa20a0ff6da7711 /src/server/game/Handlers/ArenaTeamHandler.cpp | |
| parent | d2361ae056da8caf2c9b42e03a9f17f3fcb10790 (diff) | |
| parent | 0c1587cc916de846eedf3ccf48f80caf053f427b (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/authserver/Server/AuthSession.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Server/WorldSocket.cpp
Diffstat (limited to 'src/server/game/Handlers/ArenaTeamHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ArenaTeamHandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index b2db2fff6c2..2fa73643499 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -365,6 +365,10 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket& recvData) SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_LEADER_LEAVE_S); return; } + + // Player cannot be removed during fights + if (arenaTeam->IsFighting()) + return; arenaTeam->DelMember(member->Guid, true); |