diff options
| -rw-r--r-- | src/server/game/Combat/ThreatManager.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index 65d177fddaf..652c5cffb5c 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -407,6 +407,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); |