From d64b25bac5c341daf0b6f15acba0f57995095332 Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Thu, 10 Jan 2019 09:03:31 +0100
Subject: [PATCH] Core/Vehicles: always enable gravity after leaving an vehicle
 to make sure that switching between vehicles wont disable gravity forever

---
 src/server/game/Entities/Vehicle/Vehicle.cpp      | 3 +--
 src/server/game/Entities/Vehicle/VehicleDefines.h | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 443fd26ddd..af03b39109 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -537,7 +537,7 @@ Vehicle* Vehicle::RemovePassenger(Unit* unit)
         _me->SetFlag(UNIT_NPC_FLAGS, (_me->GetTypeId() == TYPEID_PLAYER ? UNIT_NPC_FLAG_PLAYER_VEHICLE : UNIT_NPC_FLAG_SPELLCLICK));
 
     // Enable gravity for passenger when he did not have it active before entering the vehicle
-    if (seat->second.SeatInfo->HasFlag(VEHICLE_SEAT_FLAG_DISABLE_GRAVITY) && !seat->second.Passenger.IsGravityDisabled)
+    if (seat->second.SeatInfo->HasFlag(VEHICLE_SEAT_FLAG_DISABLE_GRAVITY))
         unit->SetDisableGravity(false, true);
 
     // Remove UNIT_FLAG_NOT_SELECTABLE if passenger did not have it before entering vehicle
@@ -841,7 +841,6 @@ bool VehicleJoinEvent::Execute(uint64, uint32)
     Passenger->SetVehicle(Target);
     Seat->second.Passenger.Guid = Passenger->GetGUID();
     Seat->second.Passenger.IsUnselectable = Passenger->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-    Seat->second.Passenger.IsGravityDisabled = Passenger->HasUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
     if (Seat->second.SeatInfo->CanEnterOrExit())
     {
         ASSERT(Target->UsableSeatNum);
diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h
index 59b4294619..7323517f27 100644
--- a/src/server/game/Entities/Vehicle/VehicleDefines.h
+++ b/src/server/game/Entities/Vehicle/VehicleDefines.h
@@ -80,13 +80,11 @@ struct PassengerInfo
 {
     ObjectGuid Guid;
     bool IsUnselectable;
-    bool IsGravityDisabled;
 
     void Reset()
     {
         Guid.Clear();
         IsUnselectable = false;
-        IsGravityDisabled = false;
     }
 };