From 933f9aa6dfc7503b132f9acc8e124f1b17a4d347 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Mon, 27 Mar 2023 12:24:30 -0400 Subject: [PATCH] extend bail protection during emergency drop --- .../objects/vehicles/control/CargoCarrierControl.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/psforever/objects/vehicles/control/CargoCarrierControl.scala b/src/main/scala/net/psforever/objects/vehicles/control/CargoCarrierControl.scala index 8d11c171b..a8028d017 100644 --- a/src/main/scala/net/psforever/objects/vehicles/control/CargoCarrierControl.scala +++ b/src/main/scala/net/psforever/objects/vehicles/control/CargoCarrierControl.scala @@ -25,7 +25,8 @@ class CargoCarrierControl(vehicle: Vehicle) /** * If the vehicle becomes disabled, the safety and autonomy of the cargo should be prioritized. - * @param kickPassengers passengers need to be ejected "by force" + * @param kickPassengers passengers need to be ejected "by force"; + * actually controls bail protection and flavors a log message (further down the line) */ override def PrepareForDisabled(kickPassengers: Boolean) : Unit = { super.PrepareForDisabled(kickPassengers) @@ -33,7 +34,7 @@ class CargoCarrierControl(vehicle: Vehicle) vehicle.CargoHolds.collect { case (index, hold : Cargo) if hold.isOccupied => val cargo = hold.occupant.get - checkCargoDismount(cargo.GUID, index, iteration = 0, bailed = false) + checkCargoDismount(cargo.GUID, index, iteration = 0, bailed = kickPassengers) } }