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

--HG--
branch : trunk

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)
         {

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7411"
+ #define REVISION_NR "7412"
 #endif // __REVISION_NR_H__