From 575f42089e2014c3df64f0468ed25c45a544f6d8 Mon Sep 17 00:00:00 2001 From: Wyrserth Date: Thu, 27 Jun 2019 22:08:39 +0200 Subject: Core/Spell: fix some issues with taunt spells (#23425) (cherry picked from commit 5dc2dfd60c4ecd243729e86496d926976e383156) --- src/server/game/Spells/SpellEffects.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/server/game/Spells/SpellEffects.cpp') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index dd04159818f..91b9bbc6183 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2803,7 +2803,18 @@ void Spell::EffectTaunt() // this effect use before aura Taunt apply for prevent taunt already attacking target // for spell as marked "non effective at already attacking target" - if (!unitTarget || !unitTarget->CanHaveThreatList()) + if (!unitTarget || unitTarget->IsTotem()) + { + SendCastResult(SPELL_FAILED_DONT_REPORT); + return; + } + + // Hand of Reckoning can hit some entities that can't have a threat list (including players' pets) + if (m_spellInfo->Id == 62124) + if (unitTarget->GetTypeId() != TYPEID_PLAYER && unitTarget->GetTarget() != unitCaster->GetGUID()) + unitCaster->CastSpell(unitTarget, 67485, true); + + if (!unitTarget->CanHaveThreatList()) { SendCastResult(SPELL_FAILED_DONT_REPORT); return; -- cgit v1.2.3