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

Try catch detail fixes

Browse Source
This commit is contained in:
Nick 2023-08-24 12:27:05 -04:00
parent ac188d0946
commit 6f68750117
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
NewHorizons/Builder/Props/DetailBuilder.cs
View File

@ -116,25 +116,33 @@ namespace NewHorizons.Builder.Props
foreach (var component in prop.GetComponentsInChildren<Component>(true))
{
// Components can come through as null here (yes, really),
// Usually if a script was added to a prefab in an asset bundle but isn't present in the loaded mod DLLs
if (component == null)
// Rather than having the entire prop not exist when a detail fails let's just try-catch and log an error
try
{
invalidComponentFound = true;
continue;
}
if (component.gameObject == prop && component is OWItem) isItem = true;
// Components can come through as null here (yes, really),
// Usually if a script was added to a prefab in an asset bundle but isn't present in the loaded mod DLLs
if (component == null)
{
invalidComponentFound = true;
continue;
}
if (component.gameObject == prop && component is OWItem) isItem = true;
if (sector == null)
{
if (FixUnsectoredComponent(component)) continue;
}
else
{
FixSectoredComponent(component, sector, existingSectors, detail.keepLoaded);
}
if (sector == null)
{
if (FixUnsectoredComponent(component)) continue;
}
else
{
FixSectoredComponent(component, sector, existingSectors, detail.keepLoaded);
}
FixComponent(component, go, detail.ignoreSun);
FixComponent(component, go, detail.ignoreSun);
}
catch(Exception e)
{
NHLogger.LogError($"Failed to correct component {component?.GetType()?.Name} on {go?.name} - {e}");
}
}
if (detail.path != null)
@ -155,7 +163,7 @@ namespace NewHorizons.Builder.Props
}
}
// Items shouldn't use these else they get weird
// Items should always be kept loaded else they will vanish in your hand as you leave the sector
if (isItem) detail.keepLoaded = true;
prop.transform.localScale = detail.stretch ?? (detail.scale != 0 ? Vector3.one * detail.scale : prefab.transform.localScale);