Overhaul ModPrefabRequest and PrefabHandler to fix multi request bug (#…

…508) * Overhaul ModPrefabRequest and PrefabHandler to fix multi request bug
SubnauticaModding · Dec 17, 2023 · 62fc980 · 62fc980
1 parent f006d4e
commit 62fc980
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/Nautilus/Assets/ModPrefabCache.cs b/Nautilus/Assets/ModPrefabCache.cs
@@ -125,6 +125,7 @@ public void RemoveCachedPrefab(string classId)
         {
             if(!prefab.IsPrefab())
                 Destroy(prefab);
+            InternalLogger.Debug($"ModPrefabCache: removed prefab {classId}");
             Entries.Remove(classId);
         }
     }

diff --git a/Nautilus/Assets/ModPrefabRequest.cs b/Nautilus/Assets/ModPrefabRequest.cs
@@ -25,7 +25,7 @@ public ModPrefabRequest(PrefabInfo prefabInfo)
 
     private void Init()
     {
-        if (task != null)
+        if ((task != null && !Done) || (Done && TryGetPrefab(out _)))
         {
             return;
         }
@@ -45,34 +45,37 @@ public object Current
         get
         {
             Init();
-            return task;
+            return task.Current;
         }
     }
 
     public bool TryGetPrefab(out GameObject result)
     {
-        result = taskResult.Get();
-        if (!Done)
-        {
-            Done = result;
-        }
-        return result != null;
+        return ModPrefabCache.TryGetPrefabFromCache(prefabInfo.ClassID, out result) && result != null;
     }
 
     public bool MoveNext()
     {
         Init();
-        if (task == null)
+        if (!task.MoveNext())
         {
-            return false;
+            Done = true;
         }
-
-        return !TryGetPrefab(out _);
+        return !Done;
     }
 
-    public void Reset() {}
+    public void Reset()
+    {
+        Init();
+        task.Reset();
+        Done = false;
+    }
 
     public void Release()
     {
+        ModPrefabCache.RemovePrefabFromCache(prefabInfo.ClassID);
+        taskResult = null;
+        task = null;
+        Done = false;
     }
 }
diff --git a/Nautilus/Handlers/PrefabHandler.cs b/Nautilus/Handlers/PrefabHandler.cs
@@ -26,19 +26,20 @@ internal static IEnumerator GetPrefabAsync(TaskResult<GameObject> gameObject, Pr
             yield break;
         }
 
-        yield return prefabFactory(gameObject);
-
-        yield return ProcessPrefabAsync(gameObject, info, prefabFactory);
+        yield return InitPrefabAsync(gameObject, info, prefabFactory);
     }
 
-    private static IEnumerator ProcessPrefabAsync(TaskResult<GameObject> gameObject, PrefabInfo info, PrefabFactoryAsync prefabFactory)
+    private static IEnumerator InitPrefabAsync(TaskResult<GameObject> gameObject, PrefabInfo info, PrefabFactoryAsync prefabFactory)
     {
+        yield return prefabFactory(gameObject);
+
         var obj = gameObject.Get();
         if(obj == null)
         {
-            InternalLogger.Error($"PrefabHandler: Tried to process a null prefab.");
+            InternalLogger.Error($"PrefabHandler: PrefabFactory returned null for {info.ClassID}");
             yield break;
         }
+        obj.SetActive(false);
 
         var techType = info.TechType;
         var classId = info.ClassID;
@@ -76,7 +77,6 @@ private static IEnumerator ProcessPrefabAsync(TaskResult<GameObject> gameObject,
         if (Prefabs.TryGetPostProcessorForInfo(info, out var postProcessor))
             yield return postProcessor?.Invoke(obj);
 
-
         gameObject.Set(obj);
         ModPrefabCache.AddPrefab(obj);
     }

diff --git a/Nautilus/Patchers/PrefabDatabasePatcher.cs b/Nautilus/Patchers/PrefabDatabasePatcher.cs
@@ -80,12 +80,7 @@ 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;
         }