From 723dbbff585e8a981618c37271226d07a56e915b Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Sun, 15 Aug 2021 23:32:55 +0200
Subject: [PATCH] fix(Core/Players): remove shapeshift auras on taxi restore
 (#7292)

- Closes #7240
---
 src/server/game/Entities/Player/Player.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index d55c0cd04..52935fd27 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -9721,6 +9721,11 @@ void Player::ContinueTaxiFlight()
         return;
     }
 
+    if (IsInDisallowedMountForm())
+    {
+        RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
+    }
+
     GetSession()->SendDoFlight(mountDisplayId, path, startNode);
 }