From 615fe2f47c7aa1cedd1dd2a1f6d6ea298fcc4304 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 22 Jul 2023 12:29:54 -0400 Subject: [PATCH] Keep shuttles/cannons loaded, fix cannon fact NRE --- NewHorizons/Builder/Props/GravityCannonBuilder.cs | 10 +++++----- NewHorizons/Builder/Props/ShuttleBuilder.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NewHorizons/Builder/Props/GravityCannonBuilder.cs b/NewHorizons/Builder/Props/GravityCannonBuilder.cs index 271c9699..ea88c56e 100644 --- a/NewHorizons/Builder/Props/GravityCannonBuilder.cs +++ b/NewHorizons/Builder/Props/GravityCannonBuilder.cs @@ -39,16 +39,16 @@ namespace NewHorizons.Builder.Props if (_prefab == null || planetGO == null || sector == null) return null; - var detailInfo = new DetailInfo(info); + var detailInfo = new DetailInfo(info) { keepLoaded = true }; var gravityCannonObject = DetailBuilder.Make(planetGO, sector, _prefab, detailInfo); gravityCannonObject.SetActive(false); - StreamingHandler.SetUpStreaming(gravityCannonObject, sector); - var gravityCannonController = gravityCannonObject.GetComponent(); gravityCannonController._shuttleID = ShuttleHandler.GetShuttleID(info.shuttleID); - gravityCannonController._retrieveShipLogFact = info.retrieveReveal; - gravityCannonController._launchShipLogFact = info.launchReveal; + + // Gravity controller checks string length instead of isnullorempty + gravityCannonController._retrieveShipLogFact = info.retrieveReveal ?? string.Empty; + gravityCannonController._launchShipLogFact = info.launchReveal ?? string.Empty; if (info.computer != null) { diff --git a/NewHorizons/Builder/Props/ShuttleBuilder.cs b/NewHorizons/Builder/Props/ShuttleBuilder.cs index cc0cde18..8ea32716 100644 --- a/NewHorizons/Builder/Props/ShuttleBuilder.cs +++ b/NewHorizons/Builder/Props/ShuttleBuilder.cs @@ -71,7 +71,7 @@ namespace NewHorizons.Builder.Props if (_prefab == null || planetGO == null || sector == null) return null; - var detailInfo = new DetailInfo(info); + var detailInfo = new DetailInfo(info) { keepLoaded = true }; var shuttleObject = DetailBuilder.Make(planetGO, sector, _prefab, detailInfo); shuttleObject.SetActive(false);