Fix for null ref exception on loading a world

Xlinka · Jan 5, 2025 · 513ff6a · 513ff6a
1 parent db9cfa9
commit 513ff6a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/ProjectObsidian/ProtoFlux/Audio/AudioAdder.cs b/ProjectObsidian/ProtoFlux/Audio/AudioAdder.cs
@@ -17,7 +17,7 @@ public class AudioAdderProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => AudioInput.ChannelCount;
+        public int ChannelCount => AudioInput?.ChannelCount ?? 0;
 
         public void Read<S>(Span<S> buffer) where S : unmanaged, IAudioSample<S>
         {

diff --git a/ProjectObsidian/ProtoFlux/Audio/AudioMultiply.cs b/ProjectObsidian/ProtoFlux/Audio/AudioMultiply.cs
@@ -17,7 +17,7 @@ public class AudioMultiplyProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => AudioInput.ChannelCount;
+        public int ChannelCount => AudioInput?.ChannelCount ?? 0;
 
         public void Read<S>(Span<S> buffer) where S : unmanaged, IAudioSample<S>
         {

diff --git a/ProjectObsidian/ProtoFlux/Audio/AudioSubtractor.cs b/ProjectObsidian/ProtoFlux/Audio/AudioSubtractor.cs
@@ -17,7 +17,7 @@ public class AudioSubtractorProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => AudioInput.ChannelCount;
+        public int ChannelCount => AudioInput?.ChannelCount ?? 0;
 
         public void Read<S>(Span<S> buffer) where S : unmanaged, IAudioSample<S>
         {

diff --git a/ProjectObsidian/ProtoFlux/Audio/BandPassFilterNode.cs b/ProjectObsidian/ProtoFlux/Audio/BandPassFilterNode.cs
@@ -22,7 +22,7 @@ public class BandPassFilterProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => AudioInput.ChannelCount;
+        public int ChannelCount => AudioInput?.ChannelCount ?? 0;
 
         private BandPassFilterController _controller = new();
 

diff --git a/ProjectObsidian/ProtoFlux/Audio/ButterworthFilterNode.cs b/ProjectObsidian/ProtoFlux/Audio/ButterworthFilterNode.cs
@@ -22,7 +22,7 @@ public class ButterworthFilterProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => AudioInput.ChannelCount;
+        public int ChannelCount => AudioInput?.ChannelCount ?? 0;
 
         private ButterworthFilterController _controller = new();
 

diff --git a/ProjectObsidian/ProtoFlux/Audio/EMA_IIR_SmoothSignalNode.cs b/ProjectObsidian/ProtoFlux/Audio/EMA_IIR_SmoothSignalNode.cs
@@ -18,7 +18,7 @@ public class EMA_IIR_SmoothSignalProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => AudioInput.ChannelCount;
+        public int ChannelCount => AudioInput?.ChannelCount ?? 0;
 
         public void Read<S>(Span<S> buffer) where S : unmanaged, IAudioSample<S>
         {

diff --git a/ProjectObsidian/ProtoFlux/Audio/PhaseModulatorNode.cs b/ProjectObsidian/ProtoFlux/Audio/PhaseModulatorNode.cs
@@ -21,7 +21,7 @@ public class PhaseModulatorProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => MathX.Min(AudioInput.ChannelCount, AudioInput2.ChannelCount);
+        public int ChannelCount => MathX.Min(AudioInput?.ChannelCount ?? 0, AudioInput2?.ChannelCount ?? 0);
 
         public void Read<S>(Span<S> buffer) where S : unmanaged, IAudioSample<S>
         {

diff --git a/ProjectObsidian/ProtoFlux/Audio/RingModulatorNode.cs b/ProjectObsidian/ProtoFlux/Audio/RingModulatorNode.cs
@@ -22,7 +22,7 @@ public class RingModulatorProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => MathX.Min(AudioInput.ChannelCount, AudioInput2.ChannelCount);
+        public int ChannelCount => MathX.Min(AudioInput?.ChannelCount ?? 0, AudioInput2?.ChannelCount ?? 0);
 
         public void Read<S>(Span<S> buffer) where S : unmanaged, IAudioSample<S>
         {

diff --git a/ProjectObsidian/ProtoFlux/Audio/SineShapedRingModulatorNode.cs b/ProjectObsidian/ProtoFlux/Audio/SineShapedRingModulatorNode.cs
@@ -21,7 +21,7 @@ public class SineShapedRingModulatorProxy : ProtoFluxEngineProxy, IAudioSource
 
         public bool IsActive => Active;
 
-        public int ChannelCount => MathX.Min(AudioInput.ChannelCount, AudioInput2.ChannelCount);
+        public int ChannelCount => MathX.Min(AudioInput?.ChannelCount ?? 0, AudioInput2?.ChannelCount ?? 0);
 
         public void Read<S>(Span<S> buffer) where S : unmanaged, IAudioSample<S>
         {