From c73591d5c6f932b71c0044be03fcabcd0d31faf0 Mon Sep 17 00:00:00 2001
From: JohnCorby <williamforgames6@gmail.com>
Date: Fri, 28 Jan 2022 23:05:42 -0800
Subject: [PATCH] - only await for the tasks that dont finish instantly - warn
 about still-running tasks in RemoveWorldObjects

---
 QSB/WorldSync/QSBWorldSync.cs | 70 +++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs
index 22964a5d..98b0b448 100644
--- a/QSB/WorldSync/QSBWorldSync.cs
+++ b/QSB/WorldSync/QSBWorldSync.cs
@@ -28,8 +28,8 @@ namespace QSB.WorldSync
 		public static bool AllObjectsReady { get; private set; }
 
 		private static CancellationTokenSource _cts;
-		private static readonly List<UniTask> _managerTasks = new();
-		private static readonly List<UniTask> _objectTasks = new();
+		private static readonly Dictionary<WorldObjectManager, UniTask> _managersBuilding = new();
+		private static readonly Dictionary<IWorldObject, UniTask> _objectsIniting = new();
 
 		public static async UniTaskVoid BuildWorldObjects(OWScene scene)
 		{
@@ -58,21 +58,26 @@ namespace QSB.WorldSync
 						continue;
 				}
 
-				var task = manager.Try("building world objects", async () =>
+				var task = UniTask.Create(async () =>
 				{
-					await manager.BuildWorldObjects(scene, _cts.Token);
-					DebugLog.DebugWrite($"Built {manager}", MessageType.Info);
+					await manager.Try("building world objects", async () =>
+					{
+						await manager.BuildWorldObjects(scene, _cts.Token);
+						DebugLog.DebugWrite($"Built {manager}", MessageType.Info);
+					});
+					_managersBuilding.Remove(manager);
 				});
-				_managerTasks.Add(task);
+				if (!task.Status.IsCompleted())
+				{
+					_managersBuilding.Add(manager, task);
+				}
 			}
 
-			await _managerTasks;
-			_managerTasks.Clear();
+			await _managersBuilding.Values;
 			AllObjectsAdded = true;
 			DebugLog.DebugWrite("World Objects added.", MessageType.Success);
 
-			await _objectTasks;
-			_objectTasks.Clear();
+			await _objectsIniting.Values;
 			AllObjectsReady = true;
 			DebugLog.DebugWrite("World Objects ready.", MessageType.Success);
 
@@ -95,8 +100,18 @@ namespace QSB.WorldSync
 			_cts.Dispose();
 			_cts = null;
 
-			_managerTasks.Clear();
-			_objectTasks.Clear();
+			if (_managersBuilding.Count > 0)
+			{
+				DebugLog.DebugWrite($"{_managersBuilding.Count} managers still building", MessageType.Warning);
+			}
+
+			if (_objectsIniting.Count > 0)
+			{
+				DebugLog.DebugWrite($"{_objectsIniting.Count} objects still initing", MessageType.Warning);
+			}
+
+			_managersBuilding.Clear();
+			_objectsIniting.Clear();
 			AllObjectsAdded = false;
 			AllObjectsReady = false;
 
@@ -240,7 +255,6 @@ namespace QSB.WorldSync
 			where TWorldObject : WorldObject<TUnityObject>, new()
 			where TUnityObject : MonoBehaviour
 		{
-			//DebugLog.DebugWrite($"{typeof(TWorldObject).Name} init : {listToInitFrom.Count()} instances.", MessageType.Info);
 			foreach (var item in listToInitFrom)
 			{
 				var obj = new TWorldObject
@@ -248,11 +262,7 @@ namespace QSB.WorldSync
 					AttachedObject = item,
 					ObjectId = WorldObjects.Count
 				};
-
-				var task = obj.Try("initing", async () => await obj.Init(_cts.Token));
-				_objectTasks.Add(task);
-				WorldObjects.Add(obj);
-				UnityObjectsToWorldObjects.Add(item, obj);
+				Init(obj, item);
 			}
 		}
 
@@ -275,14 +285,28 @@ namespace QSB.WorldSync
 					ObjectId = WorldObjects.Count,
 					TriggerOwner = owner
 				};
-
-				var task = obj.Try("initing", async () => await obj.Init(_cts.Token));
-				_objectTasks.Add(task);
-				WorldObjects.Add(obj);
-				UnityObjectsToWorldObjects.Add(item, obj);
+				Init(obj, item);
 			}
 		}
 
+		private static void Init<TWorldObject, TUnityObject>(TWorldObject worldObject, TUnityObject unityObject)
+			where TWorldObject : WorldObject<TUnityObject>
+			where TUnityObject : MonoBehaviour
+		{
+			var task = UniTask.Create(async () =>
+			{
+				await worldObject.Try("initing", () => worldObject.Init(_cts.Token));
+				_objectsIniting.Remove(worldObject);
+			});
+			if (!task.Status.IsCompleted())
+			{
+				_objectsIniting.Add(worldObject, task);
+			}
+
+			WorldObjects.Add(worldObject);
+			UnityObjectsToWorldObjects.Add(unityObject, worldObject);
+		}
+
 		public static void SetDialogueCondition(string name, bool state)
 		{
 			if (!QSBCore.IsHost)