diff options
| author | Shocker <none@none> | 2010-08-25 18:24:40 +0300 |
|---|---|---|
| committer | Shocker <none@none> | 2010-08-25 18:24:40 +0300 |
| commit | bd2ffab07a28b61dd3e2c3deadb4ce187c823f76 (patch) | |
| tree | 714ea6e08f25bd10536e1f9a949a8375d69b46ec /src/server/game/Movement/MotionMaster.cpp | |
| parent | 2c7cc99937411d909b0ab6e4e4e7d76f2c4b49dd (diff) | |
* 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
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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) |