From 988dc2b99c70f4a26cdddd4e1b545614eb3139f2 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 29 May 2022 16:20:27 -0400 Subject: [PATCH] Core/Combat: Allow refresh pvp combat when assisting a unit that is in pvp combat Port From (https://github.com/TrinityCore/TrinityCore/commit/b6615a45eb00a3127a11bf97a1fef1a7d81f39c7) --- Source/Game/Combat/CombatManager.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Source/Game/Combat/CombatManager.cs b/Source/Game/Combat/CombatManager.cs index 97e8a302f..ea7135254 100644 --- a/Source/Game/Combat/CombatManager.cs +++ b/Source/Game/Combat/CombatManager.cs @@ -179,14 +179,11 @@ namespace Game.Combat } foreach (var refe in mgr._pvpRefs) { - if (!IsInCombatWith(refe.Key)) - { - Unit target = refe.Value.GetOther(who); - if ((_owner.IsImmuneToPC() && target.HasUnitFlag(UnitFlags.PlayerControlled)) || - (_owner.IsImmuneToNPC() && !target.HasUnitFlag(UnitFlags.PlayerControlled))) - continue; - SetInCombatWith(target); - } + Unit target = refe.Value.GetOther(who); + if ((_owner.IsImmuneToPC() && target.HasUnitFlag(UnitFlags.PlayerControlled)) || + (_owner.IsImmuneToNPC() && !target.HasUnitFlag(UnitFlags.PlayerControlled))) + continue; + SetInCombatWith(target); } }