aboutsummaryrefslogtreecommitdiff
path: root/src/game/MotionMaster.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-03 16:29:33 -0500
committermegamage <none@none>2009-05-03 16:29:33 -0500
commit84fc76439c2f7b59c9e0995a1e4b991e27997c73 (patch)
treebe070d0c41b2ccae39c14d4f95eea18a15b6a77e /src/game/MotionMaster.cpp
parenta682bfb201c7f22f4e856224691b5734309c3547 (diff)
*Fix a crash caused by feedpet.
*Also have delay for jump spells. --HG-- branch : trunk
Diffstat (limited to 'src/game/MotionMaster.cpp')
-rw-r--r--src/game/MotionMaster.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index 51e684c5a6c..b31d3231a3b 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -333,7 +333,6 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee
{
uint32 moveFlag = MOVEFLAG_JUMP | MOVEFLAG_WALK;
uint32 time = speedZ * 100;
- i_owner->SendMonsterMove(x, y, z, moveFlag, time, speedZ);
i_owner->addUnitState(UNIT_STAT_CHARGING | UNIT_STAT_JUMPING);
i_owner->m_TempSpeed = speedXY;
@@ -348,6 +347,8 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee
i_owner->GetEntry(), i_owner->GetGUIDLow(), x, y, z );
Mutate(new PointMovementGenerator<Creature>(0,x,y,z), MOTION_SLOT_CONTROLLED);
}
+
+ i_owner->SendMonsterMove(x, y, z, moveFlag, time, speedZ);
}
void