Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hawkbar minor fixes (#575)

Browse Source 
<!-- Be sure to reference the existing issue if it exists -->
## Bug fixes
- Fixed NullReferenceException when spawning vessels with physics
- Fixed SpawnDialogue API method always creating a remote trigger
This commit is contained in:
Will Corby 2023-04-18 19:40:25 -07:00 committed by GitHub
commit 6a1900b746
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NewHorizons/Handlers/VesselWarpHandler.cs
View File

@ -145,6 +145,7 @@ namespace NewHorizons.Handlers
var hasParentBody = !string.IsNullOrEmpty(system.Config.Vessel?.vesselSpawn?.parentBody); var hasParentBody = !string.IsNullOrEmpty(system.Config.Vessel?.vesselSpawn?.parentBody);
var hasPhysics = system.Config.Vessel?.hasPhysics ?? !hasParentBody; var hasPhysics = system.Config.Vessel?.hasPhysics ?? !hasParentBody;
var planetGO = hasParentBody ? vesselObject.transform.parent.gameObject : null;
if (hasPhysics) if (hasPhysics)
{ {
@ -167,8 +168,6 @@ namespace NewHorizons.Handlers
var attachWarpExitToVessel = system.Config.Vessel?.warpExit?.attachToVessel ?? false; var attachWarpExitToVessel = system.Config.Vessel?.warpExit?.attachToVessel ?? false;
var warpExitParent = vesselWarpController._targetWarpPlatform.transform.parent; var warpExitParent = vesselWarpController._targetWarpPlatform.transform.parent;
var planetGO = hasPhysics ? vesselObject.transform.parent.gameObject : null;
var warpExit = GeneralPropBuilder.MakeFromExisting(vesselWarpController._targetWarpPlatform.gameObject, planetGO, null, system.Config.Vessel?.warpExit, parentOverride: attachWarpExitToVessel ? warpExitParent : null); var warpExit = GeneralPropBuilder.MakeFromExisting(vesselWarpController._targetWarpPlatform.gameObject, planetGO, null, system.Config.Vessel?.warpExit, parentOverride: attachWarpExitToVessel ? warpExitParent : null);
if (attachWarpExitToVessel) if (attachWarpExitToVessel)
{ {

4
NewHorizons/NewHorizonsApi.cs
View File

@ -206,11 +206,11 @@ namespace NewHorizons
radius = radius, radius = radius,
range = range, range = range,
xmlFile = xmlFile, xmlFile = xmlFile,
remoteTrigger = new RemoteTriggerInfo() remoteTrigger = remoteTriggerRadius > 0f ? new RemoteTriggerInfo()
{ {
position = null, position = null,
radius = remoteTriggerRadius, radius = remoteTriggerRadius,
}, } : null,
}; };
return DialogueBuilder.Make(root, null, info, mod); return DialogueBuilder.Make(root, null, info, mod);