From ee95a5e00fb2ee6928a819699ab93094d916d372 Mon Sep 17 00:00:00 2001
From: ModoX <moardox@gmail.com>
Date: Fri, 15 Dec 2023 10:18:30 +0100
Subject: Core/Vehicle: Only interrupt channels with
 SpellAuraInterruptFlags::Mount when entering a vehicle (#29430)

---
 src/server/game/Entities/Vehicle/Vehicle.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index cd15eac0938..24f7dfcbf95 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -834,7 +834,9 @@ bool VehicleJoinEvent::Execute(uint64, uint32)
         }
     }
 
-    Passenger->InterruptNonMeleeSpells(false);
+    Passenger->InterruptSpell(CURRENT_GENERIC_SPELL);
+    Passenger->InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
+    Passenger->RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags::Mount);
     Passenger->RemoveAurasByType(SPELL_AURA_MOUNTED);
 
     VehicleSeatEntry const* veSeat = Seat->second.SeatInfo;
-- 
cgit v1.2.3