diff options
Diffstat (limited to 'src/server/game/Combat/CombatManager.cpp')
| -rw-r--r-- | src/server/game/Combat/CombatManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index fbcad98cb50..18e4e011351 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -214,8 +214,8 @@ void CombatManager::InheritCombatStatesFrom(Unit const* who) if (!IsInCombatWith(ref.first)) { Unit* target = ref.second->GetOther(who); - if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PVP_ATTACKABLE)) || - (_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PVP_ATTACKABLE))) + if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) || + (_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED))) continue; SetInCombatWith(target); } @@ -225,8 +225,8 @@ void CombatManager::InheritCombatStatesFrom(Unit const* who) if (!IsInCombatWith(ref.first)) { Unit* target = ref.second->GetOther(who); - if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PVP_ATTACKABLE)) || - (_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PVP_ATTACKABLE))) + if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) || + (_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED))) continue; SetInCombatWith(target); } |