From 1192d023734abb6f32beb64ed32837cdc9e1f140 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 9 Feb 2020 19:22:13 +0100 Subject: [PATCH] Core/Vehicles: disable passenger gravity also for vehicles that can fly by default --- src/server/game/Entities/Vehicle/Vehicle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 7a570be9e53..61dea0e9f0e 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -563,7 +563,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)) + if (seat->second.SeatInfo->HasFlag(VEHICLE_SEAT_FLAG_DISABLE_GRAVITY) || GetBase()->CanFly()) unit->SetDisableGravity(false); // Remove UNIT_FLAG_NOT_SELECTABLE if passenger did not have it before entering vehicle @@ -900,7 +900,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32) player->UnsummonPetTemporaryIfAny(); } - if (veSeat->HasFlag(VEHICLE_SEAT_FLAG_DISABLE_GRAVITY)) + if (veSeat->HasFlag(VEHICLE_SEAT_FLAG_DISABLE_GRAVITY) || Target->GetBase()->CanFly()) Passenger->SetDisableGravity(true); if (veSeat->HasFlag(VEHICLE_SEAT_FLAG_PASSENGER_NOT_SELECTABLE))