[7412] Do not allow player with deserter debuff to be teleported to battleground Author: Triply

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index ba687f52662..7b6dcd4a5ca 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -427,6 +427,12 @@ void WorldSession::HandleBattleGroundPlayerPortOpcode( WorldPacket &recv_data )
             sLog.outError("Battleground: Invalid player queue info!");
             return;
         }
+        //if player is trying to enter battleground (not arena!) and he has deserter debuff, we must just remove him from queue
+        if( arenatype == 0 && !_player->CanJoinToBattleground() )
+        {
+            sLog.outDebug("Battleground: player %s (%u) has a deserter debuff, do not port him to battleground!", _player->GetName(), _player->GetGUIDLow());
+            action = 0;
+        }
         WorldPacket data;
         switch(action)
         {