diff options
| author | Kittnz <Kittnz@users.noreply.github.com> | 2016-05-28 09:54:53 +0200 |
|---|---|---|
| committer | Kittnz <Kittnz@users.noreply.github.com> | 2016-05-28 09:54:53 +0200 |
| commit | adf68a993e1d386a10ef4c18fa0c9260526cfc9c (patch) | |
| tree | 97d7eee6dfd3cb950117dca906b04a6e997cbd82 /src | |
| parent | bd1347569773b73bee3ae18323cc1cad9aa57f60 (diff) | |
| parent | 7d769006aa1e014d6f01ef4c7fa450e827fc32fc (diff) | |
Merge pull request #17186 from sirikfoll/combat
Core/Unit Do not allow addition of threat to units in evade mode
by sirikfoll
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0c67d4f0ed5..96bf207c274 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12173,7 +12173,7 @@ float Unit::ApplyTotalThreatModifier(float fThreat, SpellSchoolMask schoolMask) void Unit::AddThreat(Unit* victim, float fThreat, SpellSchoolMask schoolMask, SpellInfo const* threatSpell) { // Only mobs can manage threat lists - if (CanHaveThreatList()) + if (CanHaveThreatList() && !HasUnitState(UNIT_STATE_EVADE)) m_ThreatManager.addThreat(victim, fThreat, schoolMask, threatSpell); } |