From c3e401193b1d08370c4202a462de8c9083721523 Mon Sep 17 00:00:00 2001 From: Rich Dunne Date: Sun, 23 May 2021 08:32:51 -0600 Subject: [PATCH] Added check for vehicle's driver before creating new CollectedPed --- SceneManager/Paths/Path.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/SceneManager/Paths/Path.cs b/SceneManager/Paths/Path.cs index b5fae34..42a2615 100644 --- a/SceneManager/Paths/Path.cs +++ b/SceneManager/Paths/Path.cs @@ -237,14 +237,25 @@ namespace SceneManager.Paths int checksDone = 0; var collectorWaypoints = Waypoints.Where(x => x.IsCollector); - var vehiclesInWorld = World.GetAllVehicles().Where(x => x); foreach (Waypoint waypoint in collectorWaypoints.ToList()) { - foreach (Vehicle vehicle in vehiclesInWorld) + foreach (Vehicle vehicle in World.GetAllVehicles().Where(x => x)) { if (vehicle.IsNearCollectorWaypoint(waypoint) && vehicle.IsValidForPathCollection(this)) { + while(!vehicle.Driver) + { + GameFiber.Yield(); + if (!vehicle) + { + break; + } + } + if (!vehicle) + { + continue; + } CollectedPeds.Add(new CollectedPed(vehicle.Driver, this, waypoint)); }