Permalink
Browse files

Core/Spells: Interruption should be checked after knowing that the kn…

…ockback effect will happen (in this case, after the glyph checks).
  • Loading branch information...
1 parent acf7f65 commit e617c1618fc1207f9fdbf0b248d7e6f36773b8cd @johnholiver johnholiver committed May 5, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 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

0 comments on commit e617c16

Please sign in to comment.