Merge branch 'develop-2.0.0' into experimental/v3-x-x/unified-poc-migration

Author: NoelStephensUnity

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -22,6 +22,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed issue where if the `NetworkManager` player prefab is not assigned an exception is thrown upon starting a host and/or when a client joins. (#3965)
 
 ### Security
 

com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerPlayerPrefab.cs

@@ -0,0 +1,65 @@
+using System.Collections;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    /// <summary>
+    /// Generic <see cref="NetworkManager"/> test to validate clients can connect
+    /// without having set a player prefab.
+    /// </summary>
+    [TestFixture(HostOrServer.Server)]
+    [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.DAHost)]
+    internal class NetworkManagerPlayerPrefab : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 1;
+
+        public NetworkManagerPlayerPrefab(HostOrServer hostOrServer) : base(hostOrServer)
+        {
+        }
+
+        /// <summary>
+        /// Assure no player prefab is assigned.
+        /// </summary>
+        protected override void OnServerAndClientsCreated()
+        {
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                networkManager.NetworkConfig.PlayerPrefab = null;
+            }
+            base.OnServerAndClientsCreated();
+        }
+
+        protected override void OnNewClientCreated(NetworkManager networkManager)
+        {
+            networkManager.NetworkConfig.PlayerPrefab = null;
+            base.OnNewClientCreated(networkManager);
+        }
+
+        /// <summary>
+        /// Do not wait for spawned players as there are none.
+        /// </summary>
+        /// <returns></returns>
+        protected override bool ShouldCheckForSpawnedPlayers()
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Validates NetworkManager can start as a host and/or clients
+        /// can join when there is no player prefab assigned to the
+        /// NetworkManager.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator VerifyNetworkManagerHandlesNoPlayerPrefab()
+        {
+            // If we make it to here, then the 1st client and the authority
+            // connected with no exceptions.
+            // Now just late join a 2nd client.
+            yield return CreateAndStartNewClient();
+            // If it makes it to here without an exception then the test passes.
+        }
+    }
+}

com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerPlayerPrefab.cs.meta

@@ -1168,6 +1168,12 @@ protected virtual void OnTimeTravelServerAndClientsConnected()
         private void ClientNetworkManagerPostStart(NetworkManager networkManager)
         {
             networkManager.name = $"NetworkManager - Client - {networkManager.LocalClientId}";
+
+            // Always make sure we have a player to check.
+            if (!ShouldCheckForSpawnedPlayers())
+            {
+                return;
+            }
             Assert.NotNull(networkManager.LocalClient.PlayerObject, $"{nameof(StartServerAndClients)} detected that client {networkManager.LocalClientId} does not have an assigned player NetworkObject!");
 
             // Go ahead and create an entry for this new client