thegeneralist01/Scene-Manager-DevRepo
1
Fork 0
mirror of https://github.com/thegeneralist01/Scene-Manager-DevRepo synced 2026-01-11 23:50:29 +01:00
Code Issues Activity

Added more null checks

Browse source
This commit is contained in:
Rich Dunne 2020-09-03 17:49:54 -06:00
parent 02c545e6a2
commit 305aa22af2
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SceneManager/Menus/PathMainMenu.cs
View file

@ -326,7 +326,7 @@ namespace SceneManager
if (selectedItem == dismissDriver) if (selectedItem == dismissDriver)
{ {
var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(1).Where(v => v.VehicleAndDriverValid()).SingleOrDefault(); var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(1).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).SingleOrDefault();
if (nearbyVehicle) if (nearbyVehicle)
{ {
switch (dismissDriver.Index) switch (dismissDriver.Index)
@ -336,11 +336,14 @@ namespace SceneManager
if (nearbyVehicle.IsInCollectedVehicles()) if (nearbyVehicle.IsInCollectedVehicles())
{ {
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle) as CollectedVehicle; var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle) as CollectedVehicle;
if (collectedVehicle != null)
{
collectedVehicle.SetDismissNow(true); collectedVehicle.SetDismissNow(true);
collectedVehicle.Vehicle.Driver.Tasks.Clear(); collectedVehicle.Vehicle.Driver.Tasks.Clear();
collectedVehicle.Vehicle.Driver.Dismiss(); collectedVehicle.Vehicle.Driver.Dismiss();
Game.LogTrivial($"Dismissed driver of {collectedVehicle.Vehicle.Model.Name} from path {collectedVehicle.Path}"); Game.LogTrivial($"Dismissed driver of {collectedVehicle.Vehicle.Model.Name} from path {collectedVehicle.Path}");
} }
}
else else
{ {
goto case 2; goto case 2;
@ -352,6 +355,8 @@ namespace SceneManager
if (nearbyVehicle.IsInCollectedVehicles()) if (nearbyVehicle.IsInCollectedVehicles())
{ {
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle) as CollectedVehicle; var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle) as CollectedVehicle;
if(collectedVehicle != null)
{
collectedVehicle.SetStoppedAtWaypoint(false); collectedVehicle.SetStoppedAtWaypoint(false);
collectedVehicle.Vehicle.Driver.Tasks.Clear(); collectedVehicle.Vehicle.Driver.Tasks.Clear();
collectedVehicle.Vehicle.Driver.Dismiss(); collectedVehicle.Vehicle.Driver.Dismiss();
@ -366,6 +371,7 @@ namespace SceneManager
Game.LogTrivial($"Dismissed driver of {collectedVehicle.Vehicle.Model.Name} from waypoint {collectedVehicle.CurrentWaypoint}"); Game.LogTrivial($"Dismissed driver of {collectedVehicle.Vehicle.Model.Name} from waypoint {collectedVehicle.CurrentWaypoint}");
} }
} }
}
else else
{ {
goto case 2; goto case 2;