diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index b27ec160be..2738592e8a 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2527,6 +2527,10 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) spellHitTarget = m_caster; } + // Ensure that a player target is put in combat by a taunt, even if they result immune clientside + if ((missInfo == SPELL_MISS_IMMUNE || missInfo == SPELL_MISS_IMMUNE2) && m_caster->IsPlayer() && unit->IsPlayer() && m_caster->IsValidAttackTarget(unit)) + unit->SetInCombatWith(m_caster->ToPlayer()); + bool enablePvP = false; // need to check PvP state before spell effects, but act on it afterwards if (spellHitTarget) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index f6590f12ad..9edd75fcd7 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2604,9 +2604,23 @@ void Spell::EffectTaunt(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; + if (!m_caster) + return; + // 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() != m_caster->GetGUID()) + unitCaster->CastSpell(unitTarget, 67485, true); + + if (!unitTarget->CanHaveThreatList()) { SendCastResult(SPELL_FAILED_DONT_REPORT); return; @@ -2619,10 +2633,6 @@ void Spell::EffectTaunt(SpellEffIndex /*effIndex*/) return; } - // Hand of Reckoning - if (m_spellInfo->Id == 62124) - m_caster->CastSpell(unitTarget, 67485, true); - if (!mgr.IsThreatListEmpty()) // Set threat equal to highest threat currently on target mgr.MatchUnitThreatToHighestThreat(m_caster);