From f526fc9768d518ecb31d2e2d21594d025fbc005c Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Sun, 4 Aug 2019 03:24:19 +0200
Subject: [PATCH] Core/Movement: fixed a crash in MotionMaster that was caused
 in combination with MovementInform and DoZoneInCombat

---
 src/server/game/Movement/MotionMaster.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 8304a771c6c..11d1e1cd28f 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -154,7 +154,10 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
     if (empty())
         return IDLE_MOTION_TYPE;
 
-    return top()->GetMovementGeneratorType();
+    if (topOrNull())
+        return top()->GetMovementGeneratorType();
+    else
+        return IDLE_MOTION_TYPE;
 }
 
 MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const