Update & Fix

Some comments and minor adjustments.
Fixing issue where the auto-sort was disabled when using inspector view.

Author: NoelStephensUnity

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

@@ -1,5 +1,6 @@
 #if UNIFIED_NETCODE
 using Unity.NetCode;
+using UnityEditor;
 
 namespace Unity.Netcode
 {
@@ -13,14 +14,14 @@ namespace Unity.Netcode
     public partial class NetworkObjectBridge : GhostBehaviour
     {
 
-#if UNITY_EDITOR && !UNITY_INCLUDE_TESTS
+#if UNITY_EDITOR
         [UnityEngine.HideInInspector]
         [UnityEngine.SerializeField]
         private bool m_Sorted = false;
         private void OnValidate()
         {
             // Sort only once when we have first been added.
-            if (!m_Sorted)
+            if (!m_Sorted && !EditorApplication.isPlaying)
             {
                 while (UnityEditorInternal.ComponentUtility.MoveComponentUp(this))
                 {

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

@@ -37,15 +37,17 @@ protected override void OnUpdate()
         {
             var isServer = World.IsServer();
             var commandBuffer = new EntityCommandBuffer(Allocator.Temp);
-//            var networkManager = NetworkManager.Singleton;
-            foreach (var networkManager in GameObject.FindObjectsByType<NetworkManager>())
+            foreach (var networkManager in Object.FindObjectsByType<NetworkManager>())
             {
-                foreach (var (networkId, connectionState, entity) in SystemAPI.Query<NetworkId, ConnectionState>()
-                             .WithNone<NetworkStreamConnection>().WithEntityAccess())
+                foreach (var (networkId, connectionState, entity) in SystemAPI.Query<NetworkId, ConnectionState>().WithNone<NetworkStreamConnection>().WithEntityAccess())
                 {
                     commandBuffer.RemoveComponent<ConnectionState>(entity);
                     m_TempConnections.Add(new NetcodeConnection
-                        { World = World, Entity = entity, NetworkId = networkId.Value });
+                    {
+                        World = World,
+                        Entity = entity,
+                        NetworkId = networkId.Value
+                    });
                 }
 
                 foreach (var con in m_TempConnections)
@@ -62,7 +64,7 @@ protected override void OnUpdate()
                     if (!m_NewConnections.ContainsKey(networkId.Value))
                     {
                         var newConnection = new NetcodeConnection
-                            { World = World, Entity = entity, NetworkId = networkId.Value };
+                        { World = World, Entity = entity, NetworkId = networkId.Value };
                         m_NewConnections.Add(networkId.Value, newConnection);
                     }
                 }
@@ -101,11 +103,10 @@ protected override void OnUpdate()
                     {
                         commandBuffer.RemoveComponent<ConnectionState>(entity);
                         NetworkManager.OnNetCodeDisconnect?.Invoke(new NetcodeConnection
-                            { World = World, Entity = entity, NetworkId = networkId.Value });
+                        { World = World, Entity = entity, NetworkId = networkId.Value });
                     }
                 }
             }
-
             commandBuffer.Playback(EntityManager);
         }
 

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

@@ -1841,6 +1841,8 @@ internal void ShutdownInternal()
                 {
                     // Dispose of all worlds
                     World.DisposeAllWorlds();
+                    // Clear the world assigned from previous session
+                    NetcodeWorld = null;
                 }
                 catch (Exception ex)
                 {

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

@@ -2793,6 +2793,7 @@ internal string GenerateDisabledNetworkBehaviourWarning(NetworkBehaviour network
         }
 
         internal Dictionary<ushort, NetworkBehaviour> ChildNetworkBehaviours;
+
         internal bool InitializeChildNetworkBehaviours()
         {
             ChildNetworkBehaviours = new Dictionary<ushort, NetworkBehaviour>();
@@ -2839,6 +2840,7 @@ internal bool InitializeChildNetworkBehaviours()
             // automatically removed later).
             if (HasGhost)
             {
+
                 if (NetworkRigidbodies != null)
                 {
                     for (int i = NetworkRigidbodies.Count - 1; i >= 0; i--)
@@ -2849,10 +2851,14 @@ internal bool InitializeChildNetworkBehaviours()
                     NetworkRigidbodies.Clear();
                 }
 
-                // TODO: We might want to make this whole thing a noop as opposed to completely
-                // removing it.
+                // When hybrid spawning, the transform is synchronized by the GhostObject.
+                // As a convenience, we remove and destroy all NetworkTransforms.
+                // TODO-Parenting-Related-Area: We need to replicate this functionality in a GhostAdapter
+                // Possibly use a "Synchronize" property and display only on children of a root parent GhostAdapter.
                 if (NetworkTransforms != null)
                 {
+                    NetworkManager.Log.Warning(new Logging.Context(LogLevel.Developer, $"[]{name} Hybrid spawned objects do not support {nameof(NetworkTransform)} and " +
+                        $"are removed at runtime. If hybrid spawning is intended, then remove it from the network prefab to avoid allocating and de-allocating at runtime."));
                     for (int i = NetworkTransforms.Count - 1; i >= 0; i--)
                     {
                         ChildNetworkBehaviours.Remove(NetworkTransforms[i].NetworkBehaviourId);