From a4ff3f610108532264479db941c2c786e607c210 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Fri, 17 Dec 2021 18:05:12 +0100
Subject: [PATCH] fix(Core/Movement): despawn mini pets on flight take (#9624)

Fixes #9510
---
 src/server/game/Handlers/TaxiHandler.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp
index 153b29a9b..bf4b865e9 100644
--- a/src/server/game/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Handlers/TaxiHandler.cpp
@@ -123,6 +123,11 @@ void WorldSession::SendDoFlight(uint32 mountDisplayId, uint32 path, uint32 pathN
     if (mountDisplayId)
         GetPlayer()->Mount(mountDisplayId);
 
+    if (Creature* critter = ObjectAccessor::GetCreature(*GetPlayer(), GetPlayer()->GetCritterGUID()))
+    {
+        critter->DespawnOrUnsummon();
+    }
+
     GetPlayer()->GetMotionMaster()->MoveTaxiFlight(path, pathNode);
 
     sScriptMgr->AnticheatSetSkipOnePacketForASH(GetPlayer(), true);