From 2523f8eb104071624ddfbd5573368c836dd1b3bf Mon Sep 17 00:00:00 2001 From: Rich Dunne Date: Fri, 2 Oct 2020 05:41:01 -0600 Subject: [PATCH] Reconfigured some conditionals in an attempt to fix nullref exceptions --- SceneManager/VehicleCollector.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SceneManager/VehicleCollector.cs b/SceneManager/VehicleCollector.cs index bc876ae..4e8c918 100644 --- a/SceneManager/VehicleCollector.cs +++ b/SceneManager/VehicleCollector.cs @@ -90,9 +90,9 @@ namespace SceneManager private static bool IsValidForCollection(this Vehicle v) { - if(v && v.Speed > 1 && v.IsOnAllWheels && v.IsEngineOn && v != Game.LocalPlayer.Character.CurrentVehicle && v != Game.LocalPlayer.Character.LastVehicle && (v.IsCar || v.IsBike || v.IsBicycle || v.IsQuadBike || (v.HasSiren && !v.IsSirenOn)) && !collectedVehicles.Any(cv => cv.Vehicle == v)) + if(v && v.Speed > 1 && v.IsOnAllWheels && v.IsEngineOn && v != Game.LocalPlayer.Character.CurrentVehicle && v != Game.LocalPlayer.Character.LastVehicle && (v.IsCar || v.IsBike || v.IsBicycle || v.IsQuadBike) && !v.IsSirenOn && !collectedVehicles.Any(cv => cv?.Vehicle == v)) { - if(v.HasDriver && !v.Driver.IsAlive) + if(v.HasDriver && v.Driver && !v.Driver.IsAlive) { return false; }