From 7688768d9badf09a44c2a2d54717eb5d4f2fde17 Mon Sep 17 00:00:00 2001
From: Rich Dunne <richdunne@yahoo.com>
Date: Tue, 22 Sep 2020 14:40:24 -0600
Subject: [PATCH] Updated check when deleting vehicle to include all occupants,
 not just driver

---
 SceneManager/Menus/PathMainMenu.cs              | 10 +++++-----
 SceneManager/Object Classes/CollectedVehicle.cs | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/SceneManager/Menus/PathMainMenu.cs b/SceneManager/Menus/PathMainMenu.cs
index e4623b8..1555a7c 100644
--- a/SceneManager/Menus/PathMainMenu.cs
+++ b/SceneManager/Menus/PathMainMenu.cs
@@ -303,14 +303,14 @@ namespace SceneManager
                     else if(dismissDriver.Index == (int)DismissOption.FromWorld)
                     {
                         Game.LogTrivial($"Dismissed {nearbyVehicle.Model.Name} from the world");
-                        if (nearbyVehicle.HasDriver)
+                        while (nearbyVehicle.HasOccupants)
                         {
-                            while (nearbyVehicle.Driver)
+                            foreach (Ped occupant in nearbyVehicle.Occupants)
                             {
-                                nearbyVehicle.Driver.Dismiss();
-                                nearbyVehicle.Driver.Delete();
-                                GameFiber.Yield();
+                                occupant.Dismiss();
+                                occupant.Delete();
                             }
+                            GameFiber.Yield();
                         }
 
                         nearbyVehicle.Delete(); 
diff --git a/SceneManager/Object Classes/CollectedVehicle.cs b/SceneManager/Object Classes/CollectedVehicle.cs
index c3b84cb..35b8300 100644
--- a/SceneManager/Object Classes/CollectedVehicle.cs	
+++ b/SceneManager/Object Classes/CollectedVehicle.cs	
@@ -40,14 +40,14 @@ namespace SceneManager
             if (dismissOption == DismissOption.FromWorld)
             {
                 Game.LogTrivial($"Dismissed {Vehicle.Model.Name} from the world");
-                if (Vehicle.HasDriver)
+                while (Vehicle.HasOccupants)
                 {
-                    while (Vehicle.Driver)
+                    foreach(Ped occupant in Vehicle.Occupants)
                     {
-                        Vehicle.Driver.Dismiss();
-                        Vehicle.Driver.Delete();
-                        GameFiber.Yield();
+                        occupant.Dismiss();
+                        occupant.Delete();
                     }
+                    GameFiber.Yield();
                 }
                 Vehicle.Delete();
                 return;