aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkik0 <eglez.c@proton.me>2025-11-11 13:58:00 -0500
committerGitHub <noreply@github.com>2025-11-11 19:58:00 +0100
commit2a0e9633b6727feb5df3c2df4547730cd57fd366 (patch)
tree000852d6d9ec88f82839e9a83d9d3785f90221a0
parent70f1278c96b463ed6a01e74a4c5373718beab6dd (diff)
Core/Vehicles: Prevent players from eating and drinking while on vehicles (#31367)
Don't drink and drive
-rwxr-xr-xsrc/server/game/Entities/Vehicle/Vehicle.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 14ec0f18a8d..e746cc0fafd 100755
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -851,6 +851,9 @@ bool VehicleJoinEvent::Execute(uint64, uint32)
player->SendOnCancelExpectedVehicleRideAura();
if (!veSeat->HasFlag(VEHICLE_SEAT_FLAG_B_KEEP_PET))
player->UnsummonPetTemporaryIfAny();
+
+ // This is not perfectly mirroring official behavior (aura removal is delayed, most likely on heartbeat)
+ player->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_SEATED);
}
if (veSeat->HasFlag(VEHICLE_SEAT_FLAG_PASSENGER_NOT_SELECTABLE))