From ba26dd0a68de219cc2537a49c2095233ece5317f Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 3 Nov 2021 16:21:01 -0400
Subject: [PATCH] Movement/TaxiPath: Properly clean up list of taxi
 destinations upon arrival at final node.

Port From (https://github.com/TrinityCore/TrinityCore/commit/390001fa624ef996d2ae5331e201f9e2d640211b)
---
 Source/Game/Entities/Player/PlayerTaxi.cs                      | 2 ++
 Source/Game/Movement/Generators/FlightPathMovementGenerator.cs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Source/Game/Entities/Player/PlayerTaxi.cs b/Source/Game/Entities/Player/PlayerTaxi.cs
index 1bde0057a..eb0226af1 100644
--- a/Source/Game/Entities/Player/PlayerTaxi.cs
+++ b/Source/Game/Entities/Player/PlayerTaxi.cs
@@ -173,6 +173,8 @@ namespace Game.Entities
             if (m_TaxiDestinations.Empty())
                 return "";
 
+            Cypher.Assert(m_TaxiDestinations.Count >= 2);
+
             StringBuilder ss = new();
             ss.Append($"{m_flightMasterFactionId} ");
 
diff --git a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
index 7284e6660..f2642af72 100644
--- a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
+++ b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
@@ -123,6 +123,7 @@ namespace Game.Movement
             if (!active)
                 return;
 
+            owner.m_taxi.ClearTaxiDestinations();
             owner.Dismount();
             owner.RemoveUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.TaxiFlight);