From 6247294039d5b7ace1590c734c522310d6e68c43 Mon Sep 17 00:00:00 2001
From: Rich Dunne <richdunne@yahoo.com>
Date: Wed, 23 Sep 2020 05:21:11 -0600
Subject: [PATCH] Added check in vehicle dismissal loop for valid vehicle. 
 Added code to remove dismissed vehicles from collection.

---
 SceneManager/VehicleCollector.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SceneManager/VehicleCollector.cs b/SceneManager/VehicleCollector.cs
index 0ae8671..d771cdd 100644
--- a/SceneManager/VehicleCollector.cs
+++ b/SceneManager/VehicleCollector.cs
@@ -34,7 +34,7 @@ namespace SceneManager
                 while (paths.Contains(path))
                 {
                     Logger.Log($"Dismissing unused vehicles for cleanup");
-                    foreach (CollectedVehicle cv in collectedVehicles)
+                    foreach (CollectedVehicle cv in collectedVehicles.Where(cv => cv.Vehicle))
                     {
                         if (!cv.Vehicle.IsDriveable || cv.Vehicle.IsUpsideDown || !cv.Vehicle.HasDriver)
                         {
@@ -45,6 +45,8 @@ namespace SceneManager
                             cv.Vehicle.Dismiss();
                         }
                     }
+
+                    collectedVehicles.RemoveAll(cv => !cv.Vehicle);
                     GameFiber.Sleep(60000);
                 }
             });