From bd2ffab07a28b61dd3e2c3deadb4ce187c823f76 Mon Sep 17 00:00:00 2001 From: Shocker Date: Wed, 25 Aug 2010 18:24:40 +0300 Subject: * Move Paladin Judgement bonuses to spell_bonus_data, thanks deltapower.inc * Avoid code duplication by moving spell interrupt code for jump effects to a common function for both EffectJump and EffectJumpDest, thanks devthenecro --HG-- branch : trunk --- src/server/game/Movement/MotionMaster.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/server/game/Movement') diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 5094589f921..618849d0ff7 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -327,6 +327,10 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee uint32 moveFlag = SPLINEFLAG_TRAJECTORY | SPLINEFLAG_WALKING; uint32 time = uint32(speedZ * 100); + // Instantly interrupt non melee spells being casted + if (i_owner->IsNonMeleeSpellCasted(true)) + i_owner->InterruptNonMeleeSpells(true); + i_owner->addUnitState(UNIT_STAT_CHARGING | UNIT_STAT_JUMPING); i_owner->m_TempSpeed = speedXY; if (i_owner->GetTypeId() == TYPEID_PLAYER) -- cgit v1.2.3