From dd4b9ea54ae94804fa45587a53a4a91cc65fa157 Mon Sep 17 00:00:00 2001
From: JohnCorby <williamforgames6@gmail.com>
Date: Sat, 9 Jul 2022 22:45:06 -0700
Subject: [PATCH] fix softlock on vision torch

---
 NewHorizons/Builder/Props/DetailBuilder.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs
index fe648556..760ee596 100644
--- a/NewHorizons/Builder/Props/DetailBuilder.cs
+++ b/NewHorizons/Builder/Props/DetailBuilder.cs
@@ -110,6 +110,15 @@ namespace NewHorizons.Builder.Props
 
             StreamingHandler.SetUpStreaming(prop, sector);
 
+            var torchItem = prop.GetComponent<VisionTorchItem>();
+            // Fix vision torch
+            if (torchItem)
+            {
+                torchItem.enabled = true;
+                torchItem.mindProjectorTrigger.enabled = true;
+                torchItem.mindSlideProjector._mindProjectorImageEffect = SearchUtilities.Find("Player_Body/PlayerCamera").GetComponent<MindProjectorImageEffect>();
+            }
+
             foreach (var component in prop.GetComponentsInChildren<Component>(true))
             {
                 /*
@@ -176,7 +185,8 @@ namespace NewHorizons.Builder.Props
                     }
 
                     // Fix slide reel
-                    if (component is SlideCollectionContainer container)
+                    // softlocks if this object is a vision torch
+                    if (!torchItem && component is SlideCollectionContainer container)
                     {
                         sector.OnOccupantEnterSector.AddListener(_ => container.LoadStreamingTextures());
                     }
@@ -186,14 +196,6 @@ namespace NewHorizons.Builder.Props
                         socket._sector = sector;
                     }
 
-                    // Fix vision torch
-                    if (component is VisionTorchItem torchItem)
-                    {
-                        torchItem.enabled = true;
-                        torchItem.mindProjectorTrigger.enabled = true;
-                        torchItem.mindSlideProjector._mindProjectorImageEffect = SearchUtilities.Find("Player_Body/PlayerCamera").GetComponent<MindProjectorImageEffect>();
-                    }
-
                     // fix campfires
                     if (component is InteractVolume interactVolume)
                     {