Fixed issue when yield returning same request

The issue occurs because when you yield return the same request multiple times, the state machine advances but it will not wait until the code is completely executed.
SubnauticaModding · Nov 14, 2023 · 5201093 · 5201093
1 parent f655a4d
commit 5201093
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Nautilus/Assets/ModPrefabCache.cs b/Nautilus/Assets/ModPrefabCache.cs
@@ -111,7 +111,7 @@ public void EnterPrefabIntoCache(GameObject prefab)
         if(!Entries.ContainsKey(prefabIdentifier.classId))
         {
             Entries.Add(prefabIdentifier.classId, prefab);
-            InternalLogger.Debug($"ModPrefabCache: adding prefab {prefab}");
+            InternalLogger.Debug($"ModPrefabCache: added prefab {prefab}");
         }
         else // this should never happen
         {

diff --git a/Nautilus/Assets/ModPrefabRequest.cs b/Nautilus/Assets/ModPrefabRequest.cs
@@ -7,12 +7,12 @@
 namespace Nautilus.Assets;
 
 // request for getting ModPrefab asynchronously
-internal class ModPrefabRequest: IPrefabRequest, IEnumerator
+internal class ModPrefabRequest: IPrefabRequest
 {
     private readonly PrefabInfo prefabInfo;
-
-    private int state = 0;
+
     private CoroutineTask<GameObject> task;
+
     private TaskResult<GameObject> taskResult;
 
     public ModPrefabRequest(PrefabInfo prefabInfo)
@@ -56,7 +56,12 @@ public bool TryGetPrefab(out GameObject result)
     public bool MoveNext()
     {
         Init();
-        return state++ == 0;
+        if (task == null)
+        {
+            return false;
+        }
+
+        return !TryGetPrefab(out _);
     }
 
     public void Reset() {}