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 NRE in DebugPropPlacer.cs

Browse Source
This commit is contained in:
Noah Pilarski 2022-08-08 16:39:11 -04:00
parent c444b6fdb2
commit 5be2cb43ff
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs
View File

@ -93,9 +93,10 @@ namespace NewHorizons.Utility.DebugUtilities
// TODO: implement sectors // TODO: implement sectors
// if this hits a sector, store that sector and add a config file option for it // if this hits a sector, store that sector and add a config file option for it
if (!data.hitBodyGameObject.name.EndsWith("_Body")) if (data.hitBodyGameObject == null)
{ {
Logger.LogWarning("Cannot place object on non-body object: " + data.hitBodyGameObject.name); Logger.LogError($"Failed to place object {currentObject} on nothing.");
return;
} }
try try
@ -106,6 +107,12 @@ namespace NewHorizons.Utility.DebugUtilities
} }
var planetGO = data.hitBodyGameObject; var planetGO = data.hitBodyGameObject;
if (!planetGO.name.EndsWith("_Body"))
{
Logger.LogWarning("Cannot place object on non-body object: " + data.hitBodyGameObject.name);
}
var sector = planetGO.GetComponentInChildren<Sector>(); var sector = planetGO.GetComponentInChildren<Sector>();
var prefab = SearchUtilities.Find(currentObject); var prefab = SearchUtilities.Find(currentObject);
var detailInfo = new PropModule.DetailInfo() var detailInfo = new PropModule.DetailInfo()
@ -114,7 +121,9 @@ namespace NewHorizons.Utility.DebugUtilities
rotation = data.norm, rotation = data.norm,
}; };
var prop = DetailBuilder.MakeDetail(planetGO, sector, prefab, detailInfo); var prop = DetailBuilder.MakeDetail(planetGO, sector, prefab, detailInfo);
var propData = RegisterProp_WithReturn(data.hitBodyGameObject.GetComponent<AstroObject>(), prop);
var body = data.hitBodyGameObject.GetComponent<AstroObject>();
if (body != null) RegisterProp(body, prop);
SetGameObjectRotation(prop, data, playerAbsolutePosition); SetGameObjectRotation(prop, data, playerAbsolutePosition);
} }