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

Core/Combat: Fixed issues with creatures sometimes entering combat with friendly targets

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/67ffe7bcf02bc03061ae06285ea55b7eeeb76eff)
This commit is contained in:
hondacrx
2020-08-22 13:02:41 -04:00
parent 36a8844acc
commit bfe8667299
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Combat/ThreatManager.cs
+8
View File
@@ -46,6 +46,14 @@ namespace Game.Combat
if (!Owner.CanHaveThreatList() || Owner.HasUnitState(UnitState.Evade)) if (!Owner.CanHaveThreatList() || Owner.HasUnitState(UnitState.Evade))
return; return;
if (Owner.IsControlledByPlayer() || victim.IsControlledByPlayer())
{
if (Owner.IsFriendlyTo(victim) || victim.IsFriendlyTo(Owner))
return;
}
else if (!Owner.IsHostileTo(victim) && !victim.IsHostileTo(Owner))
return;
Owner.SetInCombatWith(victim); Owner.SetInCombatWith(victim);
victim.SetInCombatWith(Owner); victim.SetInCombatWith(Owner);
AddThreat(victim, amount, spell != null ? spell.GetSchoolMask() : victim.GetMeleeDamageSchoolMask(), spell); AddThreat(victim, amount, spell != null ? spell.GetSchoolMask() : victim.GetMeleeDamageSchoolMask(), spell);