diff options
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8227939fe52..389d572add9 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1247,7 +1247,7 @@ void Player::StopMirrorTimer(MirrorTimerType Type) bool Player::IsImmuneToEnvironmentalDamage() { // check for GM and death state included in isAttackableByAOE - return (!isAttackableByAOE()); + return (!isTargetableForAttack(false)); } uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 40208983597..fbfa5333eb1 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2247,6 +2247,7 @@ class Player : public Unit, public GridObject<Player> /*** ENVIROMENTAL SYSTEM ***/ /*********************************************************/ + bool IsImmuneToEnvironmentalDamage(); uint32 EnvironmentalDamage(EnviromentalDamage type, uint32 damage); /*********************************************************/ @@ -2753,8 +2754,6 @@ class Player : public Unit, public GridObject<Player> bool IsHasDelayedTeleport() const { return m_bHasDelayedTeleport; } void SetDelayedTeleportFlag(bool setting) { m_bHasDelayedTeleport = setting; } - bool IsImmuneToEnvironmentalDamage(); - void ScheduleDelayedOperation(uint32 operation) { if (operation < DELAYED_END) |