defensive null checking

m1el · Mar 29, 2021 · 3dca12b · 3dca12b
1 parent 20ee949
commit 3dca12b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Core/NsvController.cs b/Core/NsvController.cs
@@ -61,7 +61,7 @@ public void Tick()
             var delta = Time.deltaTime;
             foreach (var slicedBlock in _slicedBlockPool)
             {
-                if (slicedBlock.isActive)
+                if (!(slicedBlock is null) && slicedBlock.isActive)
                 {
                     slicedBlock.ExternalUpdate(delta);
                 }
@@ -74,7 +74,7 @@ public void Dispose()
 
             foreach (var slicedBlock in _slicedBlockPool)
             {
-                if (!slicedBlock) { continue; }
+                if (slicedBlock is null) { continue; }
                 slicedBlock.Dispose();
             }
         }
@@ -93,6 +93,7 @@ private void OnNoteCut(NoteController noteController, in NoteCutInfo noteCutInfo
             var lineIndex = ((noteController.noteData.lineIndex % 4) + 4) % 4;
             var blockIndex = lineIndex + 4 * lineLayer;
             var slicedBlock = _slicedBlockPool[blockIndex];
+            if (slicedBlock is null) { return; }
             slicedBlock.SetData(noteController, noteCutInfo, noteData);
         }
 

diff --git a/NsvAssetLoader.cs b/NsvAssetLoader.cs
@@ -12,17 +12,22 @@ internal class NsvAssetLoader : IInitializable, IDisposable
         private readonly SiraLog _siraLog;
 
         private Material? _uiNoGlowMaterial;
+        private bool _loggedNoGlowMaterial = false;
 
-        public Material UINoGlowMaterial {
+        public Material? UINoGlowMaterial {
             get {
                 if (!(_uiNoGlowMaterial is null))
                 {
                     return _uiNoGlowMaterial;
                 }
-                var sprite = Resources.FindObjectsOfTypeAll<Material>().First(m => m.name == "GameUISprite");
+                var sprite = Resources.FindObjectsOfTypeAll<Material>().FirstOrDefault(m => m.name == "GameUISprite");
                 if (sprite is null)
                 {
-                    _siraLog.Error("Trying to get GameUISprite before it was loaded. This should not happen.");
+                    if (!_loggedNoGlowMaterial)
+                    {
+                        _loggedNoGlowMaterial = true;
+                        _siraLog.Error("Trying to get GameUISprite before it was loaded. This should not happen.");
+                    }
                     return null;
                 }
 

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "id": "SliceVisualizer",
   "name": "SliceVisualizer",
   "author": "Igor null <[email protected]>",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Shows your cut data to train your accuracy",
   "gameVersion": "1.13.4",
   "dependsOn": {