From b6615a45eb00a3127a11bf97a1fef1a7d81f39c7 Mon Sep 17 00:00:00 2001 From: Gildor Date: Sun, 8 Aug 2021 13:18:08 +0200 Subject: Core/Combat: Allow refresh pvp combat when assisting a unit that is in pvp combat (#26773) (cherry picked from commit 372c84392b064d3308ad49f5aca5e3223de59b66) --- src/server/game/Combat/CombatManager.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/server/game/Combat/CombatManager.cpp') 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); } } -- cgit v1.2.3