Fixed missing reference when a prefab unloads

Metious · Dec 2, 2023 · cdd31f6 · cdd31f6
1 parent 5201093
commit cdd31f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Nautilus/Assets/ModPrefabRequest.cs b/Nautilus/Assets/ModPrefabRequest.cs
@@ -15,6 +15,8 @@ internal class ModPrefabRequest: IPrefabRequest
 
     private TaskResult<GameObject> taskResult;
 
+    internal bool done;
+
     public ModPrefabRequest(PrefabInfo prefabInfo)
     {
         this.prefabInfo = prefabInfo;
@@ -50,6 +52,10 @@ public object Current
     public bool TryGetPrefab(out GameObject result)
     {
         result = taskResult.Get();
+        if (!done)
+        {
+            done = result;
+        }
         return result != null;
     }
 

diff --git a/Nautilus/Patchers/PrefabDatabasePatcher.cs b/Nautilus/Patchers/PrefabDatabasePatcher.cs
@@ -80,7 +80,14 @@ private static IPrefabRequest GetModPrefabAsync(string classId)
         }
 
         if(ModPrefabCache.Requests.TryGetValue(prefabInfo.ClassID, out var request))
+        {
+            if (request.done && !request.TryGetPrefab(out _))
+            {
+                return new ModPrefabRequest(prefabInfo);
+            }
+
             return request;
+        }
 
         return new ModPrefabRequest(prefabInfo);
     }