diff options
| author | Gildor <gildor55@gmail.com> | 2021-08-08 13:18:08 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-12 01:16:36 +0100 |
| commit | b6615a45eb00a3127a11bf97a1fef1a7d81f39c7 (patch) | |
| tree | 1f194a5b4442a05901928644086a6d8442260327 /src/server | |
| parent | ec1c958d0152bbf611a7a17353d815288b4d2e1a (diff) | |
Core/Combat: Allow refresh pvp combat when assisting a unit that is in pvp combat (#26773)
(cherry picked from commit 372c84392b064d3308ad49f5aca5e3223de59b66)
Diffstat (limited to 'src/server')
| -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); } } |