diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/BattleGroundHandler.cpp | 6 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 7 insertions, 1 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) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 00808c101f7..157439bbbd1 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__ |