update

Fixing hybrid prefab registration and world initialization order.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs

@@ -1,5 +1,6 @@
 #if UNIFIED_NETCODE
 using System;
+using Unity.Entities;
 using Unity.NetCode;
 
 namespace Unity.Netcode
@@ -25,15 +26,15 @@ public override void Awake()
         {
             if (UnifiedBootStrap.Instance != null)
             {
-                Initialize(true);
+                Initialize();
             }
             else
             {
                 UnifiedBootStrap.OnInitialized += Initialize;
             }
         }
 
-        private void Initialize(bool initialized)
+        private void Initialize()
         {
             UnifiedBootStrap.OnInitialized -= Initialize;
             if (gameObject != null)
@@ -71,33 +72,53 @@ public override void OnDestroy()
     internal class UnifiedBootStrap : ClientServerBootstrap
     {
         public static UnifiedBootStrap Instance { get; private set; }
-        public static Action<bool> OnInitialized;
+        public static Action OnInitialized;
         public static ushort Port = 7979;
 
+        public static World World { get; private set; }
+
         public override bool Initialize(string defaultWorldName)
         {
             var networkManager = NetworkManager.Singleton;
             Instance = this;
             AutoConnectPort = Port;
-            if (networkManager.IsServer)
+            if (base.Initialize(defaultWorldName))
             {
-                CreateSingleWorldHost("ClientAndServerWorld");
-                if (networkManager.LogLevel <= LogLevel.Developer)
-                {
-                    UnityEngine.Debug.Log("Creating world: ClientAndServerWorld");
-                }
+                UnityEngine.Debug.LogError($"[{nameof(UnifiedBootStrap)}] Auto-bootstrap is enabled!!! This will break the POC!");
+                return true;
             }
-            else
+
+            World = networkManager.IsServer ? CreateSingleWorldHost("ClientAndServerWorld") : CreateClientWorld("ClientWorld");
+
+            if (World == null)
+            {
+                UnityEngine.Debug.LogError($"[{nameof(UnifiedBootStrap)}] World is null!");
+                return false;
+            }
+
+            if (!World.IsCreated)
+            {
+                UnityEngine.Debug.LogError($"[{nameof(UnifiedBootStrap)}] World was not created!");
+                return false;
+            }
+
+            if (networkManager.LogLevel <= LogLevel.Developer)
+            {
+                NetworkLog.LogInfo($"[{nameof(UnifiedBootStrap)}] Created world: {World.Name}");
+            }
+
+            if (networkManager.NetworkConfig.Prefabs.HasPendingGhostPrefabs)
             {
-                CreateClientWorld("ClientWorld");
                 if (networkManager.LogLevel <= LogLevel.Developer)
                 {
-                    UnityEngine.Debug.Log("Creating world: ClientWorld");
+                    NetworkLog.LogInfo($"[{nameof(UnifiedBootStrap)}] Registering hybrid prefabs...");
                 }
+                networkManager.NetworkConfig.Prefabs.RegisterGhostPrefabs(networkManager);
             }
-            var initialized = base.Initialize(defaultWorldName);
-            OnInitialized?.Invoke(initialized);
-            return initialized;
+
+            OnInitialized?.Invoke();
+
+            return true;
         }
 
         ~UnifiedBootStrap()

com.unity.netcode.gameobjects/Runtime/Components/Helpers/UnifiedUpdateConnections.cs

@@ -58,7 +58,7 @@ protected override void OnUpdate()
                 // client has signaled that it has synchronized (or has been sent the synchronization data) we finalize the in-game connection state (or something along those lines).
                 if (!m_NewConnections.ContainsKey(networkId.Value))
                 {
-                    var delayTime = isServer ? 0.05f : 0.1f;
+                    var delayTime = isServer ? 0.2f : 0.1f;
                     var newConnection = new NetcodeConnection { World = World, Entity = entity, NetworkId = networkId.Value, ConnectedTime = UnityEngine.Time.realtimeSinceStartup + delayTime};
                     m_NewConnections.Add(networkId.Value, newConnection);
                 }

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

@@ -341,15 +341,6 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
             {
                 case NetworkUpdateStage.EarlyUpdate:
                     {
-#if UNIFIED_NETCODE
-                        // Temporary work around for handling the registration
-                        // of hybrid spawned objects.
-                        if (NetworkConfig.Prefabs.HasPendingGhostPrefabs)
-                        {
-                            NetworkConfig.Prefabs.RegisterGhostPrefabs(this);
-                        }
-#endif
-
                         UpdateTopology();
 
                         // Handle processing any new connections or transport events
@@ -1319,14 +1310,22 @@ private bool CanStart(StartType type)
 #if UNIFIED_NETCODE
         private System.Collections.IEnumerator WaitForHybridPrefabRegistration(StartType startType)
         {
+            DefaultWorldInitialization.Initialize("Default World", false);
+            var waitTime = new WaitForSeconds(0.016f);
+            // This should not be needed at this point, but here in the event something changes.
             while (NetworkConfig.Prefabs.HasPendingGhostPrefabs)
             {
-                yield return null;
+                if (LogLevel <= LogLevel.Developer)
+                {
+                    NetworkLog.LogInfo($"[{nameof(WaitForHybridPrefabRegistration)}] Ghosts are still pending registration!");
+                }
+                NetworkConfig.Prefabs.RegisterGhostPrefabs(this);
+                yield return waitTime;
             }
             if (LogLevel <= LogLevel.Developer)
             {
-                Debug.Log("All hybrid prefabs have been registered!");
-                Debug.Log("Finalizing NetworkManager start...");
+                NetworkLog.LogInfo($"[{nameof(WaitForHybridPrefabRegistration)}] All hybrid prefabs have been registered!");
+                NetworkLog.LogInfo($"[{nameof(WaitForHybridPrefabRegistration)}] Finalizing NetworkManager start...");
             }
             switch (startType)
             {
@@ -1413,7 +1412,6 @@ public bool StartServer()
                 {
                     Debug.Log("Creating world: Default world");
                 }
-                DefaultWorldInitialization.Initialize("Default World", false);
                 StartCoroutine(WaitForHybridPrefabRegistration(StartType.Server));
                 return true;
             }
@@ -1501,7 +1499,6 @@ public bool StartClient()
                 {
                     Debug.Log("Creating world: Default world");
                 }
-                DefaultWorldInitialization.Initialize("Default World", false);
                 StartCoroutine(WaitForHybridPrefabRegistration(StartType.Client));
                 // TODO-UNIFIED: Need a way to signal everything completed.
                 return true;
@@ -1589,7 +1586,6 @@ public bool StartHost()
                 {
                     Debug.Log("Creating world: Default world");
                 }
-                DefaultWorldInitialization.Initialize("Default World", false);
                 StartCoroutine(WaitForHybridPrefabRegistration(StartType.Host));
                 // TODO-UNIFIED: Need a way to signal everything completed.
                 return true;