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

Port From (https://github.com/TrinityCore/TrinityCore/commit/67ffe7bcf02bc03061ae06285ea55b7eeeb76eff)
2020-08-22 13:02:41 -04:00
parent 36a8844acc
commit bfe8667299
1 changed files with 8 additions and 0 deletions
@@ -46,6 +46,14 @@ namespace Game.Combat
            if (!Owner.CanHaveThreatList() || Owner.HasUnitState(UnitState.Evade))
                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);
            victim.SetInCombatWith(Owner);
            AddThreat(victim, amount, spell != null ? spell.GetSchoolMask() : victim.GetMeleeDamageSchoolMask(), spell);