Fixed a potential crash when resuming a SplineChainMovementGenerator.

(cherry picked from commit e5301e2c989f9a0092aede92a38f8c75fb978b2a)

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 1852a41c3be..6398a190c3f 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;
         }