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

Fixed vehicle and driver persistence not being set after dismissal/before recollection

Browse source
This commit is contained in:
Rich Dunne 2020-10-07 05:00:29 -06:00
parent 5686363cb6
commit f0a5fb6d80
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SceneManager/Menus/PathMainMenu.cs
View file

@ -240,7 +240,7 @@ namespace SceneManager
if (selectedItem == directDriver)
{
var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(1).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).SingleOrDefault();
var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(3).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).FirstOrDefault();
if (nearbyVehicle)
{
@ -250,16 +250,15 @@ namespace SceneManager
var firstWaypoint = waypoints.First();
var nearestWaypoint = waypoints.Where(wp => wp.Position.DistanceTo2D(nearbyVehicle.FrontPosition) < wp.Position.DistanceTo2D(nearbyVehicle.RearPosition)).OrderBy(wp => wp.Position.DistanceTo2D(nearbyVehicle)).FirstOrDefault();
VehicleCollector.SetVehicleAndDriverPersistence(nearbyVehicle);
if(collectedVehicle != null)
{
collectedVehicle.Dismiss();
collectedVehicle = null;
}
VehicleCollector.SetVehicleAndDriverPersistence(nearbyVehicle);
// The vehicle should only be added to the collection when it's not null AND if the selected item is First Waypoint OR if the selected item is nearestWaypoint AND nearestWaypoint is not null
if (collectedVehicle == null && (directOptions.SelectedItem == "First waypoint" || (directOptions.SelectedItem == "Nearest waypoint" && nearestWaypoint != null)))
if (collectedVehicle == null && directOptions.SelectedItem == "First waypoint" || (directOptions.SelectedItem == "Nearest waypoint" && nearestWaypoint != null))
{
Game.LogTrivial($"[Direct Driver] {nearbyVehicle.Model.Name} not found in collection, adding now.");
VehicleCollector.collectedVehicles.Add(new CollectedVehicle(nearbyVehicle, path));