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

Close #19980

1 files changed, 9 insertions, 0 deletions

diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 5a1207b82ca..e9744008e6e 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -406,6 +406,15 @@ void ThreatManager::AddThreat(Unit* victim, float amount, SpellInfo const* spell
     (void)ignoreModifiers; (void)ignoreRedirection;
     if (!iOwner->CanHaveThreatList() || iOwner->HasUnitState(UNIT_STATE_EVADE))
         return;
+
+    if (iOwner->IsControlledByPlayer() || victim->IsControlledByPlayer())
+    {
+        if (iOwner->IsFriendlyTo(victim) || victim->IsFriendlyTo(iOwner))
+            return;
+    }
+    else if (!iOwner->IsHostileTo(victim) && !victim->IsHostileTo(iOwner))
+        return;
+
     iOwner->SetInCombatWith(victim);
     victim->SetInCombatWith(iOwner);
     addThreat(victim, amount, spell ? spell->GetSchoolMask() : victim->GetMeleeDamageSchoolMask(), spell);