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());