refactor

Refactoring the NetworkObject check.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs

@@ -885,16 +885,23 @@ internal void HandleConnectionApproval(ulong ownerClientId, bool createPlayerObj
                 var playerObject = playerPrefabHash.HasValue ? NetworkManager.SpawnManager.GetNetworkObjectToSpawn(playerPrefabHash.Value, ownerClientId, playerPosition, playerRotation)
                 : NetworkManager.SpawnManager.GetNetworkObjectToSpawn(NetworkManager.NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash, ownerClientId, playerPosition, playerRotation);
 
-                // Spawn the player NetworkObject locally
-                NetworkManager.SpawnManager.AuthorityLocalSpawn(
-                    playerObject,
-                    NetworkManager.SpawnManager.GetNetworkObjectId(),
-                    sceneObject: false,
-                    playerObject: true,
-                    ownerClientId,
-                    destroyWithScene: false);
-
-                client.AssignPlayerObject(ref playerObject);
+                if (playerObject == null)
+                {
+                    Debug.LogError($"[{nameof(NetworkObject)}] Player prefab is null! Cannot spawn player object!");
+                }
+                else
+                {
+                    // Spawn the player NetworkObject locally
+                    NetworkManager.SpawnManager.AuthorityLocalSpawn(
+                        playerObject,
+                        NetworkManager.SpawnManager.GetNetworkObjectId(),
+                        sceneObject: false,
+                        playerObject: true,
+                        ownerClientId,
+                        destroyWithScene: false);
+
+                    client.AssignPlayerObject(ref playerObject);
+                }
             }
 
             if (ownerClientId == NetworkManager.ServerClientId || !NetworkManager.NetworkConfig.EnableSceneManagement)

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

@@ -1031,13 +1031,8 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
         /// Distributed Authority:
         /// DAHost client and standard DA clients invoke this method.
         /// </summary>
-        internal void AuthorityLocalSpawn(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
+        internal void AuthorityLocalSpawn([NotNull] NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
         {
-            if (networkObject == null)
-            {
-                throw new ArgumentNullException(nameof(networkObject), "Cannot spawn null object");
-            }
-
             if (networkObject.IsSpawned)
             {
                 Debug.LogError($"{networkObject.name} is already spawned!");
@@ -1111,16 +1106,12 @@ internal void AuthorityLocalSpawn(NetworkObject networkObject, ulong networkId,
         /// <remarks>
         /// IMPORTANT: Pre spawn methods need to be invoked from within <see cref="NetworkObject.AddSceneObject"/>.
         /// </remarks>
-        internal void NonAuthorityLocalSpawn(NetworkObject networkObject, in NetworkObject.SceneObject sceneObject, bool destroyWithScene)
+        internal void NonAuthorityLocalSpawn([NotNull] NetworkObject networkObject, in NetworkObject.SceneObject sceneObject, bool destroyWithScene)
         {
-            if (networkObject == null)
-            {
-                throw new ArgumentNullException(nameof(networkObject), "Cannot spawn null object");
-            }
-
             if (networkObject.IsSpawned)
             {
-                throw new SpawnStateException($"[{networkObject.name}] Object-{networkObject.NetworkObjectId} is already spawned!");
+                Debug.LogError($"[{networkObject.name}] Object-{networkObject.NetworkObjectId} is already spawned!");
+                return;
             }
 
             // Do not invoke Pre spawn here (SynchronizeNetworkBehaviours needs to be invoked prior to this)