Core/SmartScripts: Fixes repeating events to soon when using waypoints

2018-01-11 14:20:05 -05:00
parent 79980e3dd2
commit 3d60861d29
2 changed files with 9 additions and 5 deletions
@@ -340,15 +340,19 @@ namespace Game.AI
            if (mWPReached)//reached WP
            {
                mWPReached = false;
-                SmartPath wp = GetNextWayPoint();
+                
                if (mCurrentWPID == GetWPCount())
                {
                    EndPath();
                }
-                else if (wp != null)
+                else
                {
-                    SetRun(mRun);
-                    me.GetMotionMaster().MovePoint(wp.id, wp.x, wp.y, wp.z);
+                    SmartPath wp = GetNextWayPoint();
+                    if (wp != null)
+                    {
+                        SetRun(mRun);
+                        me.GetMotionMaster().MovePoint(wp.id, wp.x, wp.y, wp.z);
+                    }
                }
            }
        }