diff options
-rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index f41042ce840..f8aebbc27ab 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -1056,7 +1056,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() |