From d60fbb842e1fa29f60a80b0b1738280e9bed9f4c Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Fri, 10 Jan 2020 21:09:13 +0100
Subject: [PATCH] Core/Movement: use better checks in GetCurrentSlot to get
 more reliable slot results

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

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index b8ef8886433..23b81dd4b6f 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -152,10 +152,10 @@ void MotionMaster::MovementExpired(bool reset /*= true*/)
 
 MovementSlot MotionMaster::GetCurrentSlot() const
 {
-    if (empty() || !top())
+    if (empty() || (_slot[MOTION_SLOT_IDLE] && !_slot[MOTION_SLOT_ACTIVE]))
         return MOTION_SLOT_IDLE;
 
-    if (top())
+    if (_slot[MOTION_SLOT_ACTIVE])
         return MOTION_SLOT_ACTIVE;
 
     return MAX_MOTION_SLOT;