aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Combat/ThreatManager.cpp
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-08-29 19:53:23 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-23 16:01:05 +0200
commit55cb4f9a6d614943ffe70b7e17ca74aeeafe3a18 (patch)
treee50dfb4a6c56570c7ea4a31beb324d36928721f0 /src/server/game/Combat/ThreatManager.cpp
parent19f24b3e40c5dd56939824a50846fcb437f4a8cd (diff)
Core/Threat: Fear no longer suppresses threat. All confuse effects now suppress threat, even ones that wouldn't break on damage.
(cherry picked from commit 704870496f672f628635e45a1cec98a485d86c28)
Diffstat (limited to 'src/server/game/Combat/ThreatManager.cpp')
-rw-r--r--src/server/game/Combat/ThreatManager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 867a34c4c44..12253e9b588 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -106,7 +106,9 @@ bool ThreatReference::ShouldBeSuppressed() const
{
if (_victim->IsImmunedToDamage(_owner->GetMeleeDamageSchoolMask()))
return true;
- if (_victim->HasBreakableByDamageCrowdControlAura())
+ if (_victim->HasAuraType(SPELL_AURA_MOD_CONFUSE))
+ return true;
+ if (_victim->HasBreakableByDamageAuraType(SPELL_AURA_MOD_STUN))
return true;
return false;
}