aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Combat
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-05-04 13:46:21 +0200
committerShauren <shauren.trinity@gmail.com>2021-09-26 16:11:59 +0200
commitc926e2fc940fdf8e328dddb829e0aaafea1e8a90 (patch)
treefe521ab75df32870b921840c138266d4384c002a /src/server/game/Combat
parent4634cfaa9f1e7064147f2c81a146234405f4e121 (diff)
1b7ec4b follow-up
(cherry picked from commit 7fe59c95d857708181991bf8478712b56e5076ac)
Diffstat (limited to 'src/server/game/Combat')
-rw-r--r--src/server/game/Combat/ThreatManager.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index d9f3d0d4b4b..ad1c513ffd1 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -108,16 +108,9 @@ ThreatReference::OnlineState ThreatReference::SelectOnlineState()
void ThreatReference::UpdateTauntState(TauntState state)
{
- if (state < TAUNT_STATE_TAUNT) // not taunting
- {
- // Check for SPELL_AURA_MOD_DETAUNT (applied from owner to victim)
- for (AuraEffect const* eff : _victim->GetAuraEffectsByType(SPELL_AURA_MOD_DETAUNT))
- if (eff->GetCasterGUID() == _owner->GetGUID())
- {
- state = TAUNT_STATE_DETAUNT;
- break;
- }
- }
+ // Check for SPELL_AURA_MOD_DETAUNT (applied from owner to victim)
+ if (state < TAUNT_STATE_TAUNT && _victim->HasAuraTypeWithCaster(SPELL_AURA_MOD_DETAUNT, _owner->GetGUID()))
+ state = TAUNT_STATE_DETAUNT;
if (state == _taunted)
return;