Fix build after last pull request merge.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user