diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Combat/CombatManager.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index dbe9f33f6b4..7cbab16aa04 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -236,14 +236,11 @@ void CombatManager::InheritCombatStatesFrom(Unit const* who) } for (auto& ref : mgr._pvpRefs) { - if (!IsInCombatWith(ref.first)) - { - Unit* target = ref.second->GetOther(who); - if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) || - (_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED))) - continue; - SetInCombatWith(target); - } + Unit* target = ref.second->GetOther(who); + if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) || + (_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED))) + continue; + SetInCombatWith(target); } } |