From e617c1618fc1207f9fdbf0b248d7e6f36773b8cd Mon Sep 17 00:00:00 2001 From: johnholiver Date: Thu, 5 May 2011 18:08:01 -0300 Subject: Core/Spells: Interruption should be checked after knowing that the knockback effect will happen (in this case, after the glyph checks). --- src/server/game/Spells/SpellEffects.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 7d1fc92113c..510ec8dc9a5 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -6064,10 +6064,6 @@ void Spell::EffectKnockBack(SpellEffIndex effIndex) if (!unitTarget) return; - // Instantly interrupt non melee spells being casted - if (unitTarget->IsNonMeleeSpellCasted(true)) - unitTarget->InterruptNonMeleeSpells(true); - // Typhoon if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x01000000) { @@ -6084,6 +6080,10 @@ void Spell::EffectKnockBack(SpellEffIndex effIndex) 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); if (ratio < 1.0f) ratio = ratio * ratio * ratio * 0.1f; // volume = length^3 -- cgit v1.2.3