update

Some fixes that should accompany the N4E POC branch.

Author: NoelStephensUnity

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

@@ -15,53 +15,13 @@ namespace Unity.Netcode
     public partial class NetworkObjectBridge : GhostBehaviour
     {
         public Action<ulong> NetworkObjectIdChanged;
-        
+
         internal GhostField<ulong> NetworkObjectId = new GhostField<ulong>();
 
         public void SetNetworkObjectId(ulong value)
         {
             NetworkObjectId.Value = value;
         }
-        public override void Awake()
-        {
-            if (UnifiedBootStrap.Instance != null)
-            {
-                Initialize();
-            }
-            else
-            {
-                UnifiedBootStrap.OnInitialized += Initialize;
-            }
-        }
-
-        private void Initialize()
-        {
-            UnifiedBootStrap.OnInitialized -= Initialize;
-            if (gameObject != null)
-            {
-                base.Awake();
-                NetworkObjectId.ValueChanged += OnNetworkObjectIdChanged;
-            }
-        }
-
-        private void OnNetworkObjectIdChanged(ulong value)
-        {
-            NetworkObjectIdChanged?.Invoke(value);
-        }
-
-        internal void OnDespawn(bool shouldDestroy)
-        {
-            if (shouldDestroy)
-            {
-                UnifiedBootStrap.OnInitialized -= Initialize;
-            }
-        }
-
-        public override void OnDestroy()
-        {
-            UnifiedBootStrap.OnInitialized -= Initialize;
-            base.OnDestroy();
-        }
     }
 
     /// <summary>

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.2f : 0.1f;
+                    var delayTime = 0.0f;// 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

@@ -1310,6 +1310,10 @@ private bool CanStart(StartType type)
 #if UNIFIED_NETCODE
         private System.Collections.IEnumerator WaitForHybridPrefabRegistration(StartType startType)
         {
+            if (NetCode.Netcode.IsActive)
+            {
+                NetworkLog.LogInfo($"[{nameof(WaitForHybridPrefabRegistration)}] Netcode is not active but has an instance at this point.");
+            }
             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.

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -1864,7 +1864,6 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
             // Let unified netcode handle destroying
             if (destroyGameObject && networkObject.HasGhost && !NetworkManager.IsServer)
             {
-                networkObject.NetworkObjectBridge.OnDespawn(destroyGameObject);
                 // exit early
                 return;
             }