From d3f8c55f31493b1b20c2955841f14cae8bd5d124 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Fri, 14 Jun 2024 21:49:26 -0400 Subject: [PATCH 1/2] Fix GetCustomFrequencyName NRE happens when going to solar system to get prefabs for eye --- NewHorizons/Builder/Props/Audio/SignalBuilder.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/NewHorizons/Builder/Props/Audio/SignalBuilder.cs b/NewHorizons/Builder/Props/Audio/SignalBuilder.cs index b5fbfaf0..e34c46f6 100644 --- a/NewHorizons/Builder/Props/Audio/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/Audio/SignalBuilder.cs @@ -121,6 +121,7 @@ namespace NewHorizons.Builder.Props.Audio public static string GetCustomFrequencyName(SignalFrequency frequencyName) { + if (_customFrequencyNames == null) return string.Empty; _customFrequencyNames.TryGetValue(frequencyName, out string name); return name; } From 3694723ee8583d8f917157eb16473f43224b778e Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Fri, 14 Jun 2024 23:41:25 -0400 Subject: [PATCH 2/2] also do GetCustomSignalName even though there is no NRE there could be in future --- NewHorizons/Builder/Props/Audio/SignalBuilder.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/NewHorizons/Builder/Props/Audio/SignalBuilder.cs b/NewHorizons/Builder/Props/Audio/SignalBuilder.cs index e34c46f6..9fd8617c 100644 --- a/NewHorizons/Builder/Props/Audio/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/Audio/SignalBuilder.cs @@ -141,6 +141,7 @@ namespace NewHorizons.Builder.Props.Audio public static string GetCustomSignalName(SignalName signalName) { + if (_customSignalNames == null) return string.Empty; _customSignalNames.TryGetValue(signalName, out string name); return name; }