Core/Vehicles: Prevent players from eating and drinking while on vehicles (#31367)

kik0desu · web-flow · commit 2a0e9633b672 · 2025-11-11T19:58:00.000+01:00
Don't drink and drive
diff --git 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))

Original file line number	Diff line number	Diff line change
`@@ -851,6 +851,9 @@ bool VehicleJoinEvent::Execute(uint64, uint32)`
`851`	`851`	`player->SendOnCancelExpectedVehicleRideAura();`
`852`	`852`	`if (!veSeat->HasFlag(VEHICLE_SEAT_FLAG_B_KEEP_PET))`
`853`	`853`	`player->UnsummonPetTemporaryIfAny();`
	`854`	`+`
	`855`	`+ // This is not perfectly mirroring official behavior (aura removal is delayed, most likely on heartbeat)`
	`856`	`+ player->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_SEATED);`
`854`	`857`	`}`
`855`	`858`
`856`	`859`	`if (veSeat->HasFlag(VEHICLE_SEAT_FLAG_PASSENGER_NOT_SELECTABLE))`