diff options
| author | Gildor <gildor55@gmail.com> | 2021-08-08 13:18:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-08 13:18:08 +0200 |
| commit | 372c84392b064d3308ad49f5aca5e3223de59b66 (patch) | |
| tree | 26de6d8e7f5c3d8f47810bd1f88a9bd5a7bbc845 /src/server/game/Combat/CombatManager.cpp | |
| parent | 39a1fd48905c4bec2d6d005ca96375e1c4c5f2ef (diff) | |
Core/Combat: Allow refresh pvp combat when assisting a unit that is in pvp combat (#26773)
Diffstat (limited to 'src/server/game/Combat/CombatManager.cpp')
| -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 cafa7726390..ce6ca5e6d54 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -237,14 +237,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->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED)) || - (_owner->IsImmuneToNPC() && !target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED))) - continue; - SetInCombatWith(target); - } + Unit* target = ref.second->GetOther(who); + if ((_owner->IsImmuneToPC() && target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED)) || + (_owner->IsImmuneToNPC() && !target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED))) + continue; + SetInCombatWith(target); } } |