add renderer nullcheck

fixes #4
Aeroluna · Jan 28, 2025 · 477dd3c · 477dd3c
1 parent bb53609
commit 477dd3c
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Vivify/ObjectPrefab/Hijackers/MpbControllerHijacker.cs b/Vivify/ObjectPrefab/Hijackers/MpbControllerHijacker.cs
@@ -9,7 +9,7 @@ internal class MpbControllerHijacker : IHijacker<GameObject>
 {
     private readonly Transform _child;
     private readonly MaterialPropertyBlockController _materialPropertyBlockController;
-    private readonly Renderer[] _originalRenderers;
+    private readonly Renderer?[] _originalRenderers;
 #if PRE_V1_39_1
     private List<int>? _cachedNumberOfMaterialsInRenderers;
 #endif
@@ -55,9 +55,12 @@ public void Activate(List<GameObject> gameObjects, bool hideOriginal)
 
         if (hideOriginal)
         {
-            foreach (Renderer renderer in _originalRenderers)
+            foreach (Renderer? renderer in _originalRenderers)
             {
-                renderer.enabled = false;
+                if (renderer != null)
+                {
+                    renderer.enabled = false;
+                }
             }
 
             _materialPropertyBlockController._renderers = newRenderers.ToArray();
@@ -87,9 +90,13 @@ public void Deactivate()
             _cachedRenderers = null;
         }
 
-        foreach (Renderer renderer in _originalRenderers)
+        // other mods (looking at you, NoteCutGuide) can cause some of the original renderers to be destroyed
+        foreach (Renderer? renderer in _originalRenderers)
         {
-            renderer.enabled = true;
+            if (renderer != null)
+            {
+                renderer.enabled = true;
+            }
         }
     }
 }