update

improving how NetworkObjectBridge is added and then sorted to the top with the GhostAdapter.

Author: NoelStephensUnity

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

@@ -14,6 +14,33 @@ namespace Unity.Netcode
     /// </remarks>
     public partial class NetworkObjectBridge : GhostBehaviour
     {
+
+#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)
+            {
+                while (UnityEditorInternal.ComponentUtility.MoveComponentUp(this))
+                {
+                    // Keep moving until it can't go higher
+                }
+                var ghostAdapter = gameObject.GetComponent<GhostAdapter>();
+                // Now move the GhostAdapter to the top so it is above NetworkObjectBridge
+                while (ghostAdapter != null && UnityEditorInternal.ComponentUtility.MoveComponentUp(ghostAdapter))
+                {
+                    // Keep moving until it can't go higher
+                }
+
+                m_Sorted = true;
+            }
+        }
+#endif
+
+
         /// <summary>
         /// This is used to link <see cref="NetworkObject.SerializedObject"/> data to
         /// N4E-spawned hybrid prefab instances.

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

@@ -291,6 +291,10 @@ internal void OnValidate()
             // Always check for in-scene placed to assure any previous version scene assets with in-scene place NetworkObjects gets updated.
             CheckForInScenePlaced();
 
+#if UNIFIED_NETCODE
+            UnifiedValidation();
+#endif
+
             // If the GlobalObjectIdHash value changed, then mark the asset dirty.
             if (GlobalObjectIdHash != oldValue)
             {
@@ -376,34 +380,13 @@ internal void UnifiedValidation()
                 HadBridge = true;
                 // Transform synchronization is handled by unified netcode
                 SynchronizeTransform = false;
-
-                // Move the bridge to the top
-                while (NetworkObjectBridge != null && UnityEditorInternal.ComponentUtility.MoveComponentUp(NetworkObjectBridge))
-                {
-                    // Keep moving until it can't go higher
-                }
-
-                // Now move the GhostAdapter to the top so it is above NetworkObjectBridge
-                while (GhostAdapter != null && UnityEditorInternal.ComponentUtility.MoveComponentUp(GhostAdapter))
-                {
-                    // Keep moving until it can't go higher
-                }
             }
             else if (HadBridge && !HasGhost && !NetworkObjectBridge)
             {
                 HadBridge = false;
                 SynchronizeTransform = true;
             }
         }
-
-        /// <summary>
-        /// TODO: This needs to be handled better.
-        /// Temporary work-around for sorting and adding components.
-        /// </summary>
-        private void OnEnable()
-        {
-            UnifiedValidation();
-        }
 #endif
 #endif
         /// <summary>

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

@@ -1278,7 +1278,7 @@ internal void AuthorityLocalSpawn([NotNull] NetworkObject networkObject, ulong n
 #if UNIFIED_NETCODE
             if (networkObject.HasGhost)
             {
-                networkObject.NetworkObjectBridge.NetworkObjectId.Value = networkObject.NetworkObjectId;
+                networkObject.NetworkObjectBridge.SetNetworkObjectId(networkObject.NetworkObjectId);
             }
 #endif