Knockback (ex: Thunderstorm) and Jump (ex: Death Grip) effects must instantly interrupt spellcasting on victim. Fixes issue 1973
--HG-- branch : trunk
This commit is contained in:
@@ -2098,6 +2098,10 @@ void Spell::EffectJump(uint32 i)
|
|||||||
if (m_caster->isInFlight())
|
if (m_caster->isInFlight())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Instantly interrupt non melee spells being casted
|
||||||
|
if (m_caster->IsNonMeleeSpellCasted(true))
|
||||||
|
m_caster->InterruptNonMeleeSpells(true);
|
||||||
|
|
||||||
float x,y,z,o;
|
float x,y,z,o;
|
||||||
if (m_targets.getUnitTarget())
|
if (m_targets.getUnitTarget())
|
||||||
{
|
{
|
||||||
@@ -2125,6 +2129,10 @@ void Spell::EffectJumpDest(uint32 i)
|
|||||||
if (m_caster->isInFlight())
|
if (m_caster->isInFlight())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Instantly interrupt non melee spells being casted
|
||||||
|
if (m_caster->IsNonMeleeSpellCasted(true))
|
||||||
|
m_caster->InterruptNonMeleeSpells(true);
|
||||||
|
|
||||||
// Init dest coordinates
|
// Init dest coordinates
|
||||||
float x,y,z,o;
|
float x,y,z,o;
|
||||||
if (m_targets.HasDst())
|
if (m_targets.HasDst())
|
||||||
@@ -6324,6 +6332,10 @@ void Spell::EffectKnockBack(uint32 i)
|
|||||||
if (!unitTarget)
|
if (!unitTarget)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Instantly interrupt non melee spells being casted
|
||||||
|
if (unitTarget->IsNonMeleeSpellCasted(true))
|
||||||
|
unitTarget->InterruptNonMeleeSpells(true);
|
||||||
|
|
||||||
// Typhoon
|
// Typhoon
|
||||||
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x01000000)
|
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x01000000)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user