Merge branch 'develop-2.0.0' into chore/remove-spawn-state-exceptions-network-object

Author: noellie-velez

.yamato/project.metafile

@@ -24,7 +24,7 @@
 small_agent_platform:
     - name: ubuntu
       type: Unity::VM
-      image: package-ci/ubuntu-22.04:v4.81.0
+      image: package-ci/ubuntu-22.04:v4.82.0
       flavor: b1.small
 
 
@@ -39,13 +39,13 @@ test_platforms:
     default:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.81.0
+          image: package-ci/ubuntu-22.04:v4.82.0
           flavor: b1.large
           standalone: StandaloneLinux64
     desktop:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.81.0
+          image: package-ci/ubuntu-22.04:v4.82.0
           flavor: b1.large
           smaller_flavor: b1.medium
           larger_flavor: b1.xlarge

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -10,15 +10,11 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Added
 
-- Added stricter checks on `InSpawned` within `NetworkObject`. (#3831)
-- Added a new `InvalidOperation` status to `OwnershipRequestStatus`. (#3831)
+- The `NetworkMetricsPipelineStage` for Unity Transport is now part of the public API. This allows using it in custom implementations of `INetworkStreamDriverConstructor` that want to maintain compatibility with the multiplayer tools package. (#3853)
 
 ### Changed
 
-- Ensure logs in `NetworkObject` log the `NetworkObject.name` wherever possible. (#3831)
-- Improved performance of NetworkBehaviour ILPostProcessor by omitting unnecessary type and assembly resolutions. (#3827)
-- Improve performance of `NetworkObject`. (#3820, #3831)
-- If the Unity Transport Disconnect Timeout is set to 0 in the Editor, the timeout will be entirely disabled. (#3810)
+- Updating usage of deprecated `FindObjectsByType(FindObjectsSortMode)` and enum `FindObjectSortMode` in 6000.4 and 6000.5. (#3857)
 
 ### Deprecated
 
@@ -28,18 +24,38 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
-- Duplicate transport connection events for the same connection will now do nothing. (#3863)
-- Fixed memory leak in `NetworkAnimator` on clients where `RpcTarget` groups were not being properly disposed due to incorrect type casting of `ProxyRpcTargetGroup` to `RpcTargetGroup`.
-- Fixed issue when using a client-server topology where a `NetworkList` with owner write permissions was resetting sent time and dirty flags after having been spawned on owning clients that were not the spawn authority. (#3850)
-- Fixed an integer overflow that occurred when configuring a large disconnect timeout with Unity Transport. (#3810)
-
+- Fixed issue where `NetworkVariable` was not properly synchronizing to changes made by the spawn and write authority during `OnNetworkSpawn` and `OnNetworkPostSpawn`. (#3878)
+- Fixed issue where `NetworkManager` was not cleaning itself up if an exception was thrown while starting. (#3864)
+- Prevented a `NullReferenceException` in `UnityTransport` when using a custom `INetworkStreamDriverConstructor` that doesn't use all the default pipelines and the multiplayer tools package is installed. (#3853)
 
 ### Security
 
 
 ### Obsolete
 
 
+## [2.9.0] - 2026-02-01
+
+### Added
+
+- Added stricter checks on `InSpawned` within `NetworkObject`. (#3831)
+- Added a new `InvalidOperation` status to `OwnershipRequestStatus`. (#3831)
+
+### Changed
+
+- Ensure logs in `NetworkObject` log the `NetworkObject.name` wherever possible. (#3831)
+- Improved performance of NetworkBehaviour ILPostProcessor by omitting unnecessary type and assembly resolutions. (#3827)
+- Improve performance of `NetworkObject`. (#3820, #3831)
+- If the Unity Transport Disconnect Timeout is set to 0 in the Editor, the timeout will be entirely disabled. (#3810)
+
+### Fixed
+
+- Duplicate transport connection events for the same connection will now do nothing. (#3863)
+- Fixed memory leak in `NetworkAnimator` on clients where `RpcTarget` groups were not being properly disposed due to incorrect type casting of `ProxyRpcTargetGroup` to `RpcTargetGroup`.
+- Fixed issue when using a client-server topology where a `NetworkList` with owner write permissions was resetting sent time and dirty flags after having been spawned on owning clients that were not the spawn authority. (#3850)
+- Fixed an integer overflow that occurred when configuring a large disconnect timeout with Unity Transport. (#3810)
+
+
 ## [2.8.0] - 2025-12-15
 
 ### Added

com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs

@@ -92,7 +92,7 @@ private static void ScenesInBuildActiveSceneCheck()
             var activeScene = SceneManager.GetActiveScene();
             var isSceneInBuildSettings = scenesList.Count((c) => c.path == activeScene.path) == 1;
 #if UNITY_2023_1_OR_NEWER
-            var networkManager = Object.FindFirstObjectByType<NetworkManager>();
+            var networkManager = Object.FindAnyObjectByType<NetworkManager>();
 #else
             var networkManager = Object.FindObjectOfType<NetworkManager>();
 #endif

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

@@ -282,7 +282,7 @@ public override void OnNetworkPreDespawn()
             {
                 ForceDetach();
             }
-            base.OnNetworkDespawn();
+            base.OnNetworkPreDespawn();
         }
 
         /// <summary>

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

@@ -0,0 +1,41 @@
+#if NGO_FINDOBJECTS_NOSORTING
+using System;
+#endif
+using System.Runtime.CompilerServices;
+using Object = UnityEngine.Object;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// Helper class to handle the variations of FindObjectsByType.
+    /// </summary>
+    /// <remarks>
+    /// It is intentional that we do not include the UnityEngine namespace in order to avoid
+    /// over-complicatd define wrapping between versions that do or don't support FindObjectsSortMode.
+    /// </remarks>
+    internal static class FindObjects
+    {
+        /// <summary>
+        /// Replaces <see cref="Object.FindObjectsByType"/> to have one place where these changes are applied.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="includeInactive">When true, inactive objects will be included.</param>
+        /// <param name="orderByIdentifier">When true, the array returned will be sorted by identifier.</param>
+        /// <returns>Resulst as an <see cref="Array"/> of type T</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static T[] ByType<T>(bool includeInactive = false, bool orderByIdentifier = false) where T : Object
+        {
+            var inactive = includeInactive ? UnityEngine.FindObjectsInactive.Include : UnityEngine.FindObjectsInactive.Exclude;
+#if NGO_FINDOBJECTS_NOSORTING
+            var results = Object.FindObjectsByType<T>(inactive);
+            if (orderByIdentifier)
+            {
+                Array.Sort(results, (a, b) => a.GetEntityId().CompareTo(b.GetEntityId()));
+            }
+#else
+            var results = Object.FindObjectsByType<T>(inactive, orderByIdentifier ? UnityEngine.FindObjectsSortMode.InstanceID : UnityEngine.FindObjectsSortMode.None);
+#endif
+            return results;
+        }
+    }
+}

com.unity.netcode.gameobjects/Runtime/Core/FindObjects.cs.meta

@@ -838,7 +838,7 @@ internal void NetworkPostSpawn()
             // all spawn related methods have been invoked.
             for (int i = 0; i < NetworkVariableFields.Count; i++)
             {
-                NetworkVariableFields[i].OnSpawned();
+                NetworkVariableFields[i].InternalOnSpawned();
             }
         }
 
@@ -891,7 +891,7 @@ internal void InternalOnNetworkPreDespawn()
             // all spawn related methods have been invoked.
             for (int i = 0; i < NetworkVariableFields.Count; i++)
             {
-                NetworkVariableFields[i].OnPreDespawn();
+                NetworkVariableFields[i].InternalOnPreDespawn();
             }
         }
 

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

@@ -1323,7 +1323,17 @@ public bool StartServer()
             }
             ConnectionManager.LocalClient.ClientId = ServerClientId;
 
-            Initialize(true);
+            try
+            {
+                Initialize(true);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+                // Always shutdown to assure everything is cleaned up
+                ShutdownInternal();
+                return false;
+            }
 
             try
             {
@@ -1342,11 +1352,12 @@ public bool StartServer()
 
                 ConnectionManager.TransportFailureEventHandler(true);
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                ConnectionManager.LocalClient.SetRole(false, false);
+                Debug.LogException(ex);
+                // Always shutdown to assure everything is cleaned up
+                ShutdownInternal();
                 IsListening = false;
-                throw;
             }
 
             return IsListening;
@@ -1373,7 +1384,16 @@ public bool StartClient()
                 return false;
             }
 
-            Initialize(false);
+            try
+            {
+                Initialize(false);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+                ShutdownInternal();
+                return false;
+            }
 
             try
             {
@@ -1391,7 +1411,7 @@ public bool StartClient()
             catch (Exception ex)
             {
                 Debug.LogException(ex);
-                ConnectionManager.LocalClient.SetRole(false, false);
+                ShutdownInternal();
                 IsListening = false;
             }
 
@@ -1419,7 +1439,18 @@ public bool StartHost()
                 return false;
             }
 
-            Initialize(true);
+            try
+            {
+                Initialize(true);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+                // Always shutdown to assure everything is cleaned up
+                ShutdownInternal();
+                return false;
+            }
+
             try
             {
                 IsListening = NetworkConfig.NetworkTransport.StartServer();
@@ -1437,7 +1468,8 @@ public bool StartHost()
             catch (Exception ex)
             {
                 Debug.LogException(ex);
-                ConnectionManager.LocalClient.SetRole(false, false);
+                // Always shutdown to assure everything is cleaned up
+                ShutdownInternal();
                 IsListening = false;
             }
 

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

@@ -58,28 +58,6 @@ public NetworkList(IEnumerable<T> values = default,
             Dispose();
         }
 
-        internal override void OnSpawned()
-        {
-            // If the NetworkList is:
-            // - Dirty
-            // - State updates can be sent:
-            // -- The instance has write permissions.
-            // -- The last sent time plus the max send time period is less than the current time.
-            // - User script has modified the list during spawn.
-            // - This instance is on the spawn authority side.
-            // When the NetworkObject is finished spawning (on the same frame), go ahead and reset
-            // the dirty related properties and last sent time to prevent duplicate entries from
-            // being sent (i.e. CreateObjectMessage will contain the changes so we don't need to
-            // send a proceeding NetworkVariableDeltaMessage).
-            if (IsDirty() && CanSend() && m_NetworkObject.IsSpawnAuthority)
-            {
-                UpdateLastSentTime();
-                ResetDirty();
-                SetDirty(false);
-            }
-            base.OnSpawned();
-        }
-
         /// <inheritdoc cref="NetworkVariable{T}.ResetDirty"/>
         public override void ResetDirty()
         {

com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs

@@ -140,27 +140,37 @@ public void Initialize(NetworkBehaviour networkBehaviour)
             }
         }
 
-        /// TODO-API: After further vetting and alignment on these, we might make them part of the public API.
-        /// Could actually be like an interface that gets automatically registered for these kinds of notifications
-        /// without having to be a NetworkBehaviour.
-        #region OnSpawn and OnPreDespawn (ETC)
-
         /// <summary>
         /// Invoked after the associated <see cref="NetworkBehaviour.OnNetworkPostSpawn"/> has been invoked.
         /// </summary>
-        internal virtual void OnSpawned()
+        internal void InternalOnSpawned()
         {
-
+            // If the NetworkVariableBase derived class is:
+            // - On the spawn authority side.
+            // - Dirty.
+            // - State updates can be sent:
+            // -- The instance has write permissions.
+            // -- The last sent time plus the max send time period is less than the current time.
+            // - User script has modified the list during spawn.
+            // When the NetworkObject is finished spawning (on the same frame), go ahead and reset
+            // the dirty related properties and last sent time to prevent duplicate updates from
+            // being sent (i.e. CreateObjectMessage will contain the changes so we don't need to
+            // send a proceeding NetworkVariableDeltaMessage).
+            if (m_NetworkObject.IsSpawnAuthority && IsDirty() && CanWrite() && CanSend())
+            {
+                UpdateLastSentTime();
+                ResetDirty();
+                SetDirty(false);
+            }
         }
 
         /// <summary>
         /// Invoked after the associated <see cref="NetworkBehaviour.OnNetworkPreDespawn"/> has been invoked.
         /// </summary>
-        internal virtual void OnPreDespawn()
+        internal void InternalOnPreDespawn()
         {
 
         }
-        #endregion
 
         /// <summary>
         /// Deinitialize is invoked when a NetworkObject is despawned.