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

Fix star system vessel merge NRE

Browse Source
This commit is contained in:
Nick 2023-03-21 20:13:51 -04:00
parent 04b8620562
commit 5d93b7c3cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NewHorizons/External/Configs/StarSystemConfig.cs vendored
View File

@ -270,12 +270,15 @@ namespace NewHorizons.External.Configs
respawnHere = respawnHere || otherConfig.respawnHere; respawnHere = respawnHere || otherConfig.respawnHere;
startHere = startHere || otherConfig.startHere; startHere = startHere || otherConfig.startHere;
Vessel = Vessel == null ? otherConfig.Vessel : Vessel; if (Vessel != null && otherConfig.Vessel != null)
if (Vessel != null)
{ {
Vessel.spawnOnVessel = Vessel.spawnOnVessel || otherConfig.Vessel.spawnOnVessel; Vessel.spawnOnVessel = Vessel.spawnOnVessel || otherConfig.Vessel.spawnOnVessel;
Vessel.alwaysPresent = Vessel.alwaysPresent || otherConfig.Vessel.alwaysPresent; Vessel.alwaysPresent = Vessel.alwaysPresent || otherConfig.Vessel.alwaysPresent;
} }
else
{
Vessel ??= otherConfig.Vessel;
}
entryPositions = Concatenate(entryPositions, otherConfig.entryPositions); entryPositions = Concatenate(entryPositions, otherConfig.entryPositions);
curiosities = Concatenate(curiosities, otherConfig.curiosities); curiosities = Concatenate(curiosities, otherConfig.curiosities);