From 83f6b761d8d5cd875e78c22829d5844fc7458a49 Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Mon, 27 Mar 2023 01:20:12 -0400
Subject: [PATCH] restored emergency drop/passenger dump from galaxy when pilot
 bails

---
 .../objects/vehicles/control/CargoCarrierControl.scala          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0c6d30846..8d11c171b 100644
--- a/src/main/scala/net/psforever/objects/vehicles/control/CargoCarrierControl.scala
+++ b/src/main/scala/net/psforever/objects/vehicles/control/CargoCarrierControl.scala
@@ -28,12 +28,12 @@ class CargoCarrierControl(vehicle: Vehicle)
     * @param kickPassengers passengers need to be ejected "by force"
     */
   override def PrepareForDisabled(kickPassengers: Boolean) : Unit = {
+    super.PrepareForDisabled(kickPassengers)
     //abandon all cargo
     vehicle.CargoHolds.collect {
       case (index, hold : Cargo) if hold.isOccupied =>
         val cargo = hold.occupant.get
         checkCargoDismount(cargo.GUID, index, iteration = 0, bailed = false)
-        super.PrepareForDisabled(kickPassengers)
     }
   }