From 96af7100b302cb1a5fba2a9235d58d2af01b807b Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Sun, 9 Oct 2022 21:26:21 +0200
Subject: [PATCH] Core/Vehicles: added a missing pointer check in
 Vehicle::RemovePassenger

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

diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 3ac5cf1717..0bb2e2d8fd 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -533,6 +533,9 @@ Vehicle* Vehicle::RemovePassenger(WorldObject* passenger)
     if (!unit)
         return nullptr;
 
+    if (unit->GetVehicle() != this)
+        return nullptr;
+
     SeatMap::iterator seat = GetSeatIteratorForPassenger(unit);
     ASSERT(seat != Seats.end());