From 0d07c33611e2fd71e6a77ab4ec2248d68846e19d Mon Sep 17 00:00:00 2001
From: sogladev <sogladev@gmail.com>
Date: Tue, 16 Jun 2026 21:27:44 +0200
Subject: [PATCH] fix(Core/Vehicle): no longer eject and overwrite an existing
 passenger (#25591)

Reject boarding a specific occupied seat instead of force-ejecting the current passenger. Followup to #25587 (Hyldnir Harpoon seat overwrite).
---
 src/server/game/Entities/Vehicle/Vehicle.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 2a64aab3cd..ca4b21f6d7 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -359,12 +359,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
             return false;
 
         if (!seat->second.IsEmpty())
-        {
-            if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), seat->second.Passenger.Guid))
-                passenger->ExitVehicle();
-
-            seat->second.Passenger.Guid.Clear();
-        }
+            return false;
 
         ASSERT(seat->second.IsEmpty());
     }