From 12c9ea08acf6564abd49650fec8a47819b45ab46 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 4 Jan 2022 20:05:19 -0500
Subject: [PATCH] Core/MovementGenerator: Fix crash in taxi paths

Port From (https://github.com/TrinityCore/TrinityCore/commit/2eea34fb47ade2ab3bf8d46d18a9880a007a2274)
---
 .../Game/Movement/Generators/FlightPathMovementGenerator.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
index 5e5a59221..3241b1213 100644
--- a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
+++ b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
@@ -75,7 +75,7 @@ namespace Game.Movement
                 return false;
 
             uint pointId = (uint)(owner.MoveSpline.CurrentPathIdx() < 0 ? 0 : owner.MoveSpline.CurrentPathIdx());
-            if (pointId > _currentNode)
+            if (pointId > _currentNode && _currentNode < _path.Count)
             {
                 bool departureEvent = true;
                 do
@@ -92,7 +92,7 @@ namespace Game.Movement
                         }
                     }
 
-                    if (pointId == _currentNode)
+                    if (pointId >= _currentNode)
                         break;
 
                     if (_currentNode == _preloadTargetNode)