Fixed a potential crash when resuming a SplineChainMovementGenerator.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp
index 068d6075a71..e6d0d583ba9 100644
--- a/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/SplineChainMovementGenerator.cpp
@@ -71,7 +71,9 @@ void SplineChainMovementGenerator::Initialize(Unit* me)
             SendPathSpline(me, partial);
             TC_LOG_DEBUG("movement.splinechain", "%s: Resumed spline chain generator from resume state.", me->GetGUID().ToString().c_str());
             ++_nextIndex;
-            if (!_msToNext)
+            if (_nextIndex >= _chainSize)
+                _msToNext = 0;
+            else if (!_msToNext)
                 _msToNext = 1;
             _nextFirstWP = 0;
         }