diff options
| author | Wyrserth <wyrserth@protonmail.com> | 2019-06-27 22:08:39 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-13 00:42:18 +0100 |
| commit | 575f42089e2014c3df64f0468ed25c45a544f6d8 (patch) | |
| tree | 089bc769b640db03a0ddaedb698c8182a6176392 /src/server/game/Spells/Spell.cpp | |
| parent | 9d40a105e61376dd5f377f5d1e8131f6669ffdca (diff) | |
Core/Spell: fix some issues with taunt spells (#23425)
(cherry picked from commit 5dc2dfd60c4ecd243729e86496d926976e383156)
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8486580a215..3bc60f66b3c 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2372,6 +2372,10 @@ void Spell::TargetInfo::PreprocessTarget(Spell* spell) else if (MissCondition == SPELL_MISS_REFLECT && ReflectResult == SPELL_MISS_NONE) _spellHitTarget = spell->m_caster->ToUnit(); + // Ensure that a player target is put in combat by a taunt, even if they result immune clientside + if ((MissCondition == SPELL_MISS_IMMUNE || MissCondition == SPELL_MISS_IMMUNE2) && spell->m_caster->GetTypeId() == TYPEID_PLAYER && unit->GetTypeId() == TYPEID_PLAYER && spell->m_caster->IsValidAttackTarget(unit, spell->GetSpellInfo())) + unit->SetInCombatWith(spell->m_caster->ToPlayer()); + _enablePVP = false; // need to check PvP state before spell effects, but act on it afterwards if (_spellHitTarget) { |