Core/Combat: Allow refresh pvp combat when assisting a unit that is in pvp combat
Port From (https://github.com/TrinityCore/TrinityCore/commit/b6615a45eb00a3127a11bf97a1fef1a7d81f39c7)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user