aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Movement/MotionMaster.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index d77ce6e9a73..3fd6523b017 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -1112,7 +1112,8 @@ void MotionMaster::Remove(MotionMasterContainer::iterator iterator, bool active,
void MotionMaster::Pop(bool active, bool movementInform)
{
- Remove(_generators.begin(), active, movementInform);
+ if (!_generators.empty())
+ Remove(_generators.begin(), active, movementInform);
}
void MotionMaster::DirectInitialize()