Core/Arenas: Disallow leaving arena team while in arena

1 files changed, 7 insertions, 0 deletions

diff --git a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
index 9bd1fc70849..8732d560e62 100755
--- a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
@@ -204,6 +204,13 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData)
     if (!arenaTeam)
         return;
 
+    // Disallow leave team while in arena
+    if (_player->InArena())
+    {
+        SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_INTERNAL);
+        return;
+    }
+
     // Team captain can't leave the team if other members are still present
     if (_player->GetGUID() == arenaTeam->GetCaptain() && arenaTeam->GetMembersSize() > 1)
     {