update & fixes

Some adjustments to the POC Transport.
Some fixes.

Author: NoelStephensUnity

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

@@ -82,21 +82,10 @@ public override bool Initialize(string defaultWorldName)
 
             return true;
         }
-        
-        public static void StopClient()
-        {
-            ClientWorld.Dispose();
-            ClientWorlds.Remove(ClientWorld);
-        }
-        
-        public static void StopServer()
-        {
-            ServerWorld.Dispose();
-            ServerWorlds.Remove(ServerWorld);
-        }
 
         ~UnifiedBootStrap()
         {
+            World = null;
             Instance = null;
         }
     }

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

@@ -31,15 +31,6 @@ internal partial class UnifiedUpdateConnections : SystemBase
         private List<NetcodeConnection> m_TempConnections = new List<NetcodeConnection>();
 
         private Dictionary<int, NetcodeConnection> m_NewConnections = new Dictionary<int, NetcodeConnection>();
-
-        public void MarkSync(int NetworkId)
-        {
-            if (m_NewConnections.TryGetValue(NetworkId, out var connection))
-            {
-                connection.IsSynced = true;
-                m_NewConnections[NetworkId] = connection;
-            }
-        }
 
         protected override void OnUpdate()
         {

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

@@ -1204,11 +1204,11 @@ internal void Initialize(bool server)
 
             // UnityTransport dependencies are then initialized
             RealTimeProvider = ComponentFactory.Create<IRealTimeProvider>(this);
-            
+
 #if UNIFIED_NETCODE
             NetworkConfig.NetworkTransport = gameObject.AddComponent<UnifiedNetcodeTransport>();
 #endif
-            
+
             MetricsManager.Initialize(this);
 
             {
@@ -1320,18 +1320,27 @@ private System.Collections.IEnumerator WaitForHybridPrefabRegistration(StartType
             {
                 NetworkLog.LogInfo($"[{nameof(WaitForHybridPrefabRegistration)}] Netcode is not active but has an instance at this point.");
             }
+
+            /// !! Important !!
+            /// Clear out any pre-existing configuration in the event this applicatioin instance has already been connected to a session.
+            NetCode.Netcode.Reset();
+
+            /// !! Initialize worlds here !!
+            /// Worlds are created here: <see cref="UnifiedBootStrap.Initialize"/>
             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)
+
+            // This should not be needed at this point, but this is here in the event something changes.
+            if (NetworkConfig.Prefabs.HasPendingGhostPrefabs)
             {
-                if (LogLevel <= LogLevel.Developer)
+                NetworkLog.LogWarning($"[{nameof(WaitForHybridPrefabRegistration)}] !!!!! (Ghosts are still pending registration) !!!!!");
+                var waitTime = new WaitForSeconds(0.016f);
+                while (NetworkConfig.Prefabs.HasPendingGhostPrefabs)
                 {
-                    NetworkLog.LogInfo($"[{nameof(WaitForHybridPrefabRegistration)}] Ghosts are still pending registration!");
+                    NetworkConfig.Prefabs.RegisterGhostPrefabs(this);
+                    yield return waitTime;
                 }
-                NetworkConfig.Prefabs.RegisterGhostPrefabs(this);
-                yield return waitTime;
             }
+
             if (LogLevel <= LogLevel.Developer)
             {
                 NetworkLog.LogInfo($"[{nameof(WaitForHybridPrefabRegistration)}] All hybrid prefabs have been registered!");

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

@@ -1740,9 +1740,11 @@ private void OnDestroy()
 #if UNIFIED_NETCODE
             spawnManager?.GhostsPendingSpawn.Remove(NetworkObjectId);
             spawnManager?.GhostsPendingSynchronization.Remove(NetworkObjectId);
-#endif
-
+            // N4E controls this on the client, allow this if there is a ghost
+            if (IsSpawned && !HasGhost && !networkManager.ShutdownInProgress)
+#else
             if (IsSpawned && !networkManager.ShutdownInProgress)
+#endif
             {
                 // An authorized destroy is when done by the authority instance or done due to a scene event and the NetworkObject
                 // was marked as destroy pending scene event (which means the destroy with scene property was set).

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SceneEventMessage.cs

@@ -1,7 +1,3 @@
-
-using Unity.Netcode.Components;
-using Unity.Netcode.Unified;
-
 namespace Unity.Netcode
 {
     // Todo: Would be lovely to get this one nicely formatted with all the data it sends in the struct
@@ -30,11 +26,6 @@ public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
             networkManager.SceneManager.HandleSceneEvent(context.SenderId, m_ReceivedData);
-            
-#if UNIFIED_NETCODE
-            var unifiedConnectionSystem = NetCode.Netcode.GetWorld(false).GetExistingSystemManaged<UnifiedUpdateConnections>();
-            unifiedConnectionSystem.MarkSync((int)context.SenderId);
-#endif
         }
     }
 }

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

@@ -83,10 +83,14 @@ internal NetworkObject GetGhostNetworkObjectForSpawn(ulong networkObjectId)
                 return null;
             }
             var networkObject = GhostsPendingSpawn[networkObjectId];
+            
             GhostsPendingSpawn.Remove(networkObjectId);
-            // TODO-UNIFIED: We need a better way to preserve any hybrid instances pending NGO spawn.
-            // NOTE: We might be able to use the NetworkSceneHandle to get the associated local scene handle to which we can use to get the targeted scene.
-            UnityEngine.SceneManagement.SceneManager.MoveGameObjectToScene(networkObject.gameObject, UnityEngine.SceneManagement.SceneManager.GetActiveScene());
+            if (networkObject != null)
+            {
+                // TODO-UNIFIED: We need a better way to preserve any hybrid instances pending NGO spawn.
+                // NOTE: We might be able to use the NetworkSceneHandle to get the associated local scene handle to which we can use to get the targeted scene.
+                UnityEngine.SceneManagement.SceneManager.MoveGameObjectToScene(networkObject.gameObject, UnityEngine.SceneManagement.SceneManager.GetActiveScene());
+            }
             return networkObject;
         }
 

com.unity.netcode.gameobjects/Runtime/Transports/Unified/UnifiedNetcodeTransport.cs

@@ -1,19 +1,17 @@
 #if UNIFIED_NETCODE
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Unity.Burst;
 using Unity.Burst.Intrinsics;
 using Unity.Collections;
-using Unity.Collections.LowLevel.Unsafe;
 using Unity.Entities;
 using Unity.NetCode;
 using Unity.Netcode.Transports.UTP;
 using Unity.Networking.Transport;
-using UnityEngine;
 
 namespace Unity.Netcode.Unified
 {
+    [BurstCompile]
     internal struct TransportRpc : IRpcCommand, IRpcCommandSerializer<TransportRpc>
     {
         public FixedList4096Bytes<byte> Buffer;
@@ -31,8 +29,10 @@ public unsafe void Deserialize(ref DataStreamReader reader, in RpcDeserializerSt
         {
             data.Order = reader.ReadULong();
             var length = reader.ReadInt();
-            data.Buffer = new FixedList4096Bytes<byte>();
-            data.Buffer.Length = length;
+            data.Buffer = new FixedList4096Bytes<byte>()
+            {
+                Length = length
+            };
             var span = new Span<byte>(data.Buffer.GetUnsafePtr(), length);
             reader.ReadBytes(span);
         }
@@ -43,29 +43,29 @@ private static void InvokeExecute(ref RpcExecutor.Parameters parameters)
             RpcExecutor.ExecuteCreateRequestComponent<TransportRpc, TransportRpc>(ref parameters);
         }
 
-        static readonly PortableFunctionPointer<RpcExecutor.ExecuteDelegate> InvokeExecuteFunctionPointer = new PortableFunctionPointer<RpcExecutor.ExecuteDelegate>(InvokeExecute);
+        private static readonly PortableFunctionPointer<RpcExecutor.ExecuteDelegate> k_InvokeExecuteFunctionPointer = new PortableFunctionPointer<RpcExecutor.ExecuteDelegate>(InvokeExecute);
 
         public PortableFunctionPointer<RpcExecutor.ExecuteDelegate> CompileExecute()
         {
-            return InvokeExecuteFunctionPointer;
+            return k_InvokeExecuteFunctionPointer;
         }
     }
 
     [UpdateInGroup(typeof(RpcCommandRequestSystemGroup))]
     [CreateAfter(typeof(RpcSystem))]
     [BurstCompile]
-    partial struct TransportRpcCommandRequestSystem : ISystem
+    internal partial struct TransportRpcCommandRequestSystem : ISystem
     {
         private RpcCommandRequest<TransportRpc, TransportRpc> m_Request;
 
         [BurstCompile]
-        struct SendRpc : IJobChunk
+        internal struct SendRpc : IJobChunk
         {
-            public RpcCommandRequest<TransportRpc, TransportRpc>.SendRpcData data;
+            public RpcCommandRequest<TransportRpc, TransportRpc>.SendRpcData Data;
 
             public void Execute(in ArchetypeChunk chunk, int unfilteredChunkIndex, bool useEnabledMask, in v128 chunkEnabledMask)
             {
-                data.Execute(chunk, unfilteredChunkIndex);
+                Data.Execute(chunk, unfilteredChunkIndex);
             }
         }
 
@@ -77,7 +77,7 @@ public void OnCreate(ref SystemState state)
         [BurstCompile]
         public void OnUpdate(ref SystemState state)
         {
-            var sendJob = new SendRpc { data = m_Request.InitJobData(ref state) };
+            var sendJob = new SendRpc { Data = m_Request.InitJobData(ref state) };
             state.Dependency = sendJob.Schedule(m_Request.Query, state.Dependency);
         }
     }
@@ -128,10 +128,6 @@ internal class UnifiedNetcodeTransport : NetworkTransport
         private int m_ServerClientId = -1;
         public override ulong ServerClientId => (ulong)m_ServerClientId;
 
-        private bool m_IsClient;
-        private bool m_IsServer;
-        private bool m_StartedServerWorld = false;
-        private bool m_StartedClientWorld = false;
         private NetworkManager m_NetworkManager;
 
         private IRealTimeProvider m_RealTimeProvider;
@@ -265,12 +261,6 @@ private void OnServerClientDisconnected(Connection connection, NetCodeConnection
 
         public override bool StartClient()
         {
-            if (!UnifiedBootStrap.HasClientWorlds)
-            {
-                UnifiedBootStrap.CreateClientWorld("ClientWorld");
-                m_StartedClientWorld = true;
-            }
-
             NetCode.Netcode.Client.OnConnect = OnClientConnectedToServer;
             NetCode.Netcode.Client.OnDisconnect = OnClientDisconnectFromServer;
             var updateSystem = NetCode.Netcode.GetWorld(false).GetExistingSystemManaged<UnifiedNetcodeUpdateSystem>();
@@ -283,17 +273,9 @@ public override bool StartClient()
 
         public override bool StartServer()
         {
-            if (!UnifiedBootStrap.HasServerWorld)
+            foreach (var connection in NetCode.Netcode.Server.Connections)
             {
-                UnifiedBootStrap.CreateServerWorld("ServerWorld");
-                m_StartedClientWorld = true;
-            }
-            else
-            {
-                foreach (var connection in NetCode.Netcode.Server.Connections)
-                {
-                    OnServerNewClientConnection(connection, default);
-                }
+                OnServerNewClientConnection(connection, default);
             }
 
             NetCode.Netcode.Server.OnConnect = OnServerNewClientConnection;
@@ -326,24 +308,17 @@ public override ulong GetCurrentRtt(ulong clientId)
             return (ulong)m_Connections[(int)transportId].Connection.RTT;
         }
 
-        public override void Shutdown()
-        {
-            if (m_StartedClientWorld)
-            {
-                UnifiedBootStrap.StopClient();
-            }
-            if (m_StartedServerWorld)
-            {
-                UnifiedBootStrap.StopServer();
-            }
-        }
-
         public override void Initialize(NetworkManager networkManager = null)
         {
             m_Connections = new Dictionary<int, ConnectionInfo>();
             m_RealTimeProvider = networkManager.RealTimeProvider;
             m_NetworkManager = networkManager;
         }
+
+        public override void Shutdown()
+        {
+
+        }
     }
 }
-#endif
+#endif