From 15b81468155053dfa8ec924ab4ab766f604f8a9f Mon Sep 17 00:00:00 2001
From: Michal Pikulski <michal@foolhardyhorizons.com>
Date: Thu, 11 Sep 2025 15:48:44 +0200
Subject: [PATCH] Update Puzzle Manager's initialization sequence

---
 Assets/Scripts/PuzzleS/PuzzleManager.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Assets/Scripts/PuzzleS/PuzzleManager.cs b/Assets/Scripts/PuzzleS/PuzzleManager.cs
index ae8c9f1b..a3517e6a 100644
--- a/Assets/Scripts/PuzzleS/PuzzleManager.cs
+++ b/Assets/Scripts/PuzzleS/PuzzleManager.cs
@@ -1,6 +1,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 using PuzzleS;
+using UnityEngine.SceneManagement;
 
 /// <summary>
 /// Manages puzzle step registration, dependency management, and step completion for the puzzle system.
@@ -44,6 +45,18 @@ public class PuzzleManager : MonoBehaviour
     {
         _instance = this;
         // DontDestroyOnLoad(gameObject);
+        SceneManager.sceneLoaded += OnSceneLoaded;
+    }
+
+    void OnDestroy()
+    {
+        SceneManager.sceneLoaded -= OnSceneLoaded;
+    }
+
+    private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+    {
+        BuildRuntimeDependencies();
+        UnlockInitialSteps();
     }
 
     /// <summary>
@@ -71,12 +84,6 @@ public class PuzzleManager : MonoBehaviour
         Debug.Log($"[Puzzles] Unregistered step: {behaviour.stepData.stepId} on {behaviour.gameObject.name}");
     }
 
-    void Start()
-    {
-        BuildRuntimeDependencies();
-        UnlockInitialSteps();
-    }
-
     /// <summary>
     /// Builds the runtime dependency graph for all registered steps.
     /// </summary>