Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Close #19980

(cherry picked from commit 07593f6c34)
This commit is contained in:
treeston
2017-07-03 19:40:04 -03:00
committed by Shauren
parent daf9c703c4
commit 67ffe7bcf0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Combat/ThreatManager.cpp
View File

@@ -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);