Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Combat: Allow refresh pvp combat when assisting a unit that is in pvp combat

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b6615a45eb00a3127a11bf97a1fef1a7d81f39c7)
This commit is contained in:
hondacrx
2022-05-29 16:20:27 -04:00
parent 4de86618f3
commit 988dc2b99c
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Combat/CombatManager.cs
-3
View File
@@ -178,8 +178,6 @@ namespace Game.Combat
} }
} }
foreach (var refe in mgr._pvpRefs) foreach (var refe in mgr._pvpRefs)
{
if (!IsInCombatWith(refe.Key))
{ {
Unit target = refe.Value.GetOther(who); Unit target = refe.Value.GetOther(who);
if ((_owner.IsImmuneToPC() && target.HasUnitFlag(UnitFlags.PlayerControlled)) || if ((_owner.IsImmuneToPC() && target.HasUnitFlag(UnitFlags.PlayerControlled)) ||
@@ -188,7 +186,6 @@ namespace Game.Combat
SetInCombatWith(target); SetInCombatWith(target);
} }
} }
}
public void EndCombatBeyondRange(float range, bool includingPvP) public void EndCombatBeyondRange(float range, bool includingPvP)
{ {