diff --git a/src/game/Player.cpp b/src/game/Player.cpp index c8ee02338..da003ff80 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -17515,7 +17515,7 @@ void Player::LeaveBattleground(bool teleportToEntryPoint) bg->RemovePlayerAtLeave(GetGUID(), teleportToEntryPoint, true); // call after remove to be sure that player resurrected for correct cast - if( bg->isBattleGround() && sWorld.getConfig(CONFIG_BATTLEGROUND_CAST_DESERTER) ) + if( bg->isBattleGround() && !isGameMaster() && sWorld.getConfig(CONFIG_BATTLEGROUND_CAST_DESERTER) ) { if( bg->GetStatus() == STATUS_IN_PROGRESS || bg->GetStatus() == STATUS_WAIT_JOIN ) CastSpell(this, 26013, true); // Deserter diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6105c19b7..9fa633605 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 "7735" + #define REVISION_NR "7736" #endif // __REVISION_NR_H__