Core/Spells: Interruption should be checked after knowing that the knockback effect will happen (in this case, after the glyph checks).
This commit is contained in:
@@ -6064,10 +6064,6 @@ void Spell::EffectKnockBack(SpellEffIndex effIndex)
|
|||||||
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)
|
||||||
{
|
{
|
||||||
@@ -6084,6 +6080,10 @@ void Spell::EffectKnockBack(SpellEffIndex effIndex)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Instantly interrupt non melee spells being casted
|
||||||
|
if (unitTarget->IsNonMeleeSpellCasted(true))
|
||||||
|
unitTarget->InterruptNonMeleeSpells(true);
|
||||||
|
|
||||||
float ratio = m_caster->GetCombatReach() / std::max(unitTarget->GetCombatReach(), 1.0f);
|
float ratio = m_caster->GetCombatReach() / std::max(unitTarget->GetCombatReach(), 1.0f);
|
||||||
if (ratio < 1.0f)
|
if (ratio < 1.0f)
|
||||||
ratio = ratio * ratio * ratio * 0.1f; // volume = length^3
|
ratio = ratio * ratio * ratio * 0.1f; // volume = length^3
|
||||||
|
|||||||
Reference in New Issue
Block a user