diff options
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 23cc2d97d7b..890d4d91bbe 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -161,9 +161,13 @@ void MotionMaster::MovementExpired(bool reset /*= true*/) MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const { if (empty()) - return IDLE_MOTION_TYPE; + return MAX_MOTION_TYPE; + + MovementGenerator* movement = top(); + if (!movement) + return MAX_MOTION_TYPE; - return top()->GetMovementGeneratorType(); + return movement->GetMovementGeneratorType(); } MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const |