From 42f579f28095ab0843ac4506fd84355efc5b0d4a Mon Sep 17 00:00:00 2001 From: Triply Date: Sun, 8 Mar 2009 10:45:36 +0100 Subject: [PATCH] [7412] Do not allow player with deserter debuff to be teleported to battleground Signed-off-by: Triply --- src/game/BattleGroundHandler.cpp | 6 ++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 5990c4309..c5b19d798 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -425,6 +425,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) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 00808c101..157439bbb 100644 --- a/src/shared/revision_nr.h +++ b/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__