refactor!: remove spawn payload technical debt (#1005)

NoelStephensUnity · web-flow · commit bba72a4b40df · 2021-08-02T13:25:02.000-05:00
* refactor

Removing the option to send a payload when spawning an object.
The primary reason for this is that we do not save the payload data on a per NetworkObject instance basis and if a user were to use the spawn payload parameter that included data that was required to set any specific states of a NetworkObject or associated components then late joining players would not receive the payload information and would become out of sych with the game.

* refactor and style

Needed more than 1 commit and left out a few checks for payload when reading as well as removed XML Doc parameters that referred to "payload".
diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs
@@ -316,21 +316,12 @@ protected NetworkBehaviour GetNetworkBehaviour(ushort behaviourId)
         public ulong OwnerClientId => NetworkObject.OwnerClientId;
 
         /// <summary>
-        /// Gets called when message handlers are ready to be registered and the network is setup
+        /// Gets called when the <see cref="MLAPI.NetworkObject"/> gets spawned, message handlers are ready to be registered and the network is setup.
         /// </summary>
         public virtual void OnNetworkSpawn() { }
 
         /// <summary>
-        /// Gets called when the <see cref="NetworkObject"/> gets spawned, message handlers are ready to be registered and the network is setup. Provides a Payload if it was provided
-        /// </summary>
-        /// <param name="stream">The stream containing the spawn payload</param>
-        public virtual void OnNetworkSpawn(Stream stream)
-        {
-            OnNetworkSpawn();
-        }
-
-        /// <summary>
-        /// Gets called when the <see cref="NetworkObject"/> gets de-spawned. Is called both on the server and clients.
+        /// Gets called when the <see cref="MLAPI.NetworkObject"/> gets despawned. Is called both on the server and clients.
         /// </summary>
         public virtual void OnNetworkDespawn() { }
 
diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
@@ -1415,7 +1415,7 @@ internal void HandleApproval(ulong ownerClientId, bool createPlayerObject, uint?
                 if (createPlayerObject)
                 {
                     var networkObject = SpawnManager.CreateLocalNetworkObject(false, playerPrefabHash ?? NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash, ownerClientId, null, position, rotation);
-                    SpawnManager.SpawnNetworkObjectLocally(networkObject, SpawnManager.GetNetworkObjectId(), false, true, ownerClientId, null, false, 0, false, false);
+                    SpawnManager.SpawnNetworkObjectLocally(networkObject, SpawnManager.GetNetworkObjectId(), false, true, ownerClientId, null, false, false);
 
                     ConnectedClients[ownerClientId].PlayerObject = networkObject;
                 }
diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs
@@ -3,12 +3,10 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using MLAPI.Configuration;
 using MLAPI.Exceptions;
 using MLAPI.Hashing;
 using MLAPI.Logging;
 using MLAPI.Messaging;
-using MLAPI.Serialization.Pooled;
 using MLAPI.Transports;
 using MLAPI.Serialization;
 using UnityEngine;
@@ -222,11 +220,10 @@ private void Awake()
         }
 
         /// <summary>
-        /// Shows a previously hidden object to a client
+        /// Shows a previously hidden <see cref="NetworkObject"/> to a client
         /// </summary>
-        /// <param name="clientId">The client to show the object to</param>
-        /// <param name="payload">An optional payload to send as part of the spawn</param>
-        public void NetworkShow(ulong clientId, Stream payload = null)
+        /// <param name="clientId">The client to show the <see cref="NetworkObject"/> to</param>
+        public void NetworkShow(ulong clientId)
         {
             if (!IsSpawned)
             {
@@ -245,16 +242,15 @@ public void NetworkShow(ulong clientId, Stream payload = null)
 
             Observers.Add(clientId);
 
-            NetworkManager.SpawnManager.SendSpawnCallForObject(clientId, OwnerClientId, this, payload);
+            NetworkManager.SpawnManager.SendSpawnCallForObject(clientId, OwnerClientId, this);
         }
 
         /// <summary>
-        /// Shows a list of previously hidden objects to a client
+        /// Shows a list of previously hidden <see cref="NetworkObject"/>s to a client
         /// </summary>
-        /// <param name="networkObjects">The objects to show</param>
+        /// <param name="networkObjects">The <see cref="NetworkObject"/>s to show</param>
         /// <param name="clientId">The client to show the objects to</param>
-        /// <param name="payload">An optional payload to send as part of the spawns</param>
-        public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientId, Stream payload = null)
+        public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientId)
         {
             if (networkObjects == null || networkObjects.Count == 0)
             {
@@ -304,7 +300,7 @@ public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientI
                         networkObjects[i].Observers.Add(clientId);
 
                         networkManager.SpawnManager.WriteSpawnCallForObject(nonNullContext.NetworkWriter, clientId,
-                            networkObjects[i], payload);
+                            networkObjects[i]);
                     }
                 }
             }
@@ -429,7 +425,7 @@ private void OnDestroy()
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void SpawnInternal(Stream spawnPayload, bool destroyWithScene, ulong? ownerClientId, bool playerObject)
+        private void SpawnInternal(bool destroyWithScene, ulong? ownerClientId, bool playerObject)
         {
             if (!NetworkManager.IsListening)
             {
@@ -441,52 +437,44 @@ private void SpawnInternal(Stream spawnPayload, bool destroyWithScene, ulong? ow
                 throw new NotServerException($"Only server can spawn {nameof(NetworkObject)}s");
             }
 
-            if (spawnPayload != null)
-            {
-                spawnPayload.Position = 0;
-            }
-
-            NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.SpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene);
+            NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.SpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId,null, false, destroyWithScene);
             ulong ownerId = ownerClientId != null ? ownerClientId.Value : NetworkManager.ServerClientId;
             for (int i = 0; i < NetworkManager.ConnectedClientsList.Count; i++)
             {
                 if (Observers.Contains(NetworkManager.ConnectedClientsList[i].ClientId))
                 {
-                    NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.ConnectedClientsList[i].ClientId, ownerId, this, spawnPayload);
+                    NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.ConnectedClientsList[i].ClientId, ownerId, this);
                 }
             }
         }
 
         /// <summary>
-        /// Spawns this GameObject across the network. Can only be called from the Server
+        /// Spawns this <see cref="NetworkObject"/> across the network. Can only be called from the Server
         /// </summary>
-        /// <param name="spawnPayload">The writer containing the spawn payload</param>
         /// <param name="destroyWithScene">Should the object be destroyed when the scene is changed</param>
-        public void Spawn(Stream spawnPayload = null, bool destroyWithScene = false)
+        public void Spawn(bool destroyWithScene = false)
         {
-            SpawnInternal(spawnPayload, destroyWithScene, null, false);
+            SpawnInternal(destroyWithScene, null, false);
         }
 
         /// <summary>
-        /// Spawns an object across the network with a given owner. Can only be called from server
+        /// Spawns a <see cref="NetworkObject"/> across the network with a given owner. Can only be called from server
         /// </summary>
         /// <param name="clientId">The clientId to own the object</param>
-        /// <param name="spawnPayload">The writer containing the spawn payload</param>
-        /// <param name="destroyWithScene">Should the object be destroyd when the scene is changed</param>
-        public void SpawnWithOwnership(ulong clientId, Stream spawnPayload = null, bool destroyWithScene = false)
+        /// <param name="destroyWithScene">Should the object be destroyed when the scene is changed</param>
+        public void SpawnWithOwnership(ulong clientId, bool destroyWithScene = false)
         {
-            SpawnInternal(spawnPayload, destroyWithScene, clientId, false);
+            SpawnInternal(destroyWithScene, clientId, false);
         }
 
         /// <summary>
-        /// Spawns an object across the network and makes it the player object for the given client
+        /// Spawns a <see cref="NetworkObject"/> across the network and makes it the player object for the given client
         /// </summary>
         /// <param name="clientId">The clientId whos player object this is</param>
-        /// <param name="spawnPayload">The writer containing the spawn payload</param>
         /// <param name="destroyWithScene">Should the object be destroyd when the scene is changed</param>
-        public void SpawnAsPlayerObject(ulong clientId, Stream spawnPayload = null, bool destroyWithScene = false)
+        public void SpawnAsPlayerObject(ulong clientId, bool destroyWithScene = false)
         {
-            SpawnInternal(spawnPayload, destroyWithScene, clientId, true);
+            SpawnInternal(destroyWithScene, clientId, true);
         }
 
         /// <summary>
@@ -781,12 +769,12 @@ internal static void CheckOrphanChildren()
             }
         }
 
-        internal void InvokeBehaviourNetworkSpawn(Stream stream)
+        internal void InvokeBehaviourNetworkSpawn()
         {
             for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
             {
                 ChildNetworkBehaviours[i].InternalOnNetworkSpawn();
-                ChildNetworkBehaviours[i].OnNetworkSpawn(stream);
+                ChildNetworkBehaviours[i].OnNetworkSpawn();
             }
         }
 
@@ -1055,7 +1043,7 @@ internal static NetworkObject DeserializeSceneObject(NetworkBuffer objectStream,
             }
 
             // Spawn the NetworkObject
-            networkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, isSceneObject, isPlayerObject, ownerClientId, objectStream, false, 0, true, false);
+            networkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, isSceneObject, isPlayerObject, ownerClientId, objectStream, true, false);
 
             return networkObject;
         }
diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs
@@ -164,12 +164,9 @@ public void HandleAddObject(ulong clientId, Stream stream)
 
                 var (isReparented, latestParent) = NetworkObject.ReadNetworkParenting(reader);
 
-                var hasPayload = reader.ReadBool();
-                var payLoadLength = hasPayload ? reader.ReadInt32Packed() : 0;
-
                 var networkObject = NetworkManager.SpawnManager.CreateLocalNetworkObject(softSync, prefabHash, ownerClientId, parentNetworkId, pos, rot, isReparented);
                 networkObject.SetNetworkParenting(isReparented, latestParent);
-                NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, hasPayload, payLoadLength, true, false);
+                NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, true, false);
             }
         }
 
diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs
@@ -346,7 +346,7 @@ private void OnServerLoadedScene(Guid switchSceneGuid)
             {
                 if (!keyValuePair.Value.IsPlayerObject)
                 {
-                    m_NetworkManager.SpawnManager.SpawnNetworkObjectLocally(keyValuePair.Value, m_NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, null, null, false, 0, false, true);
+                    m_NetworkManager.SpawnManager.SpawnNetworkObjectLocally(keyValuePair.Value, m_NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, null, null, false, true);
                 }
             }
 
diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs
@@ -282,7 +282,7 @@ internal NetworkObject CreateLocalNetworkObject(bool isSceneObject, uint globalO
         }
 
         // Ran on both server and client
-        internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong? ownerClientId, Stream dataStream, bool readPayload, int payloadLength, bool readNetworkVariable, bool destroyWithScene)
+        internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong? ownerClientId, Stream dataStream, bool readNetworkVariable, bool destroyWithScene)
         {
             if (networkObject == null)
             {
@@ -350,24 +350,10 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong netwo
             networkObject.SetCachedParent(networkObject.transform.parent);
             networkObject.ApplyNetworkParenting();
             NetworkObject.CheckOrphanChildren();
-
-            if (readPayload)
-            {
-                using (var payloadBuffer = PooledNetworkBuffer.Get())
-                {
-                    payloadBuffer.CopyUnreadFrom(dataStream, payloadLength);
-                    dataStream.Position += payloadLength;
-                    payloadBuffer.Position = 0;
-                    networkObject.InvokeBehaviourNetworkSpawn(payloadBuffer);
-                }
-            }
-            else
-            {
-                networkObject.InvokeBehaviourNetworkSpawn(null);
-            }
+            networkObject.InvokeBehaviourNetworkSpawn();
         }
 
-        internal void SendSpawnCallForObject(ulong clientId, ulong ownerClientId, NetworkObject networkObject, Stream payload)
+        internal void SendSpawnCallForObject(ulong clientId, ulong ownerClientId, NetworkObject networkObject)
         {
             //Currently, if this is called and the clientId (destination) is the server's client Id, this case
             //will be checked within the below Send function.  To avoid unwarranted allocation of a PooledNetworkBuffer
@@ -386,12 +372,12 @@ internal void SendSpawnCallForObject(ulong clientId, ulong ownerClientId, Networ
             {
                 using (var nonNullContext = (InternalCommandContext)context)
                 {
-                    WriteSpawnCallForObject(nonNullContext.NetworkWriter, ownerClientId, networkObject, payload);
+                    WriteSpawnCallForObject(nonNullContext.NetworkWriter, ownerClientId, networkObject);
                 }
             }
         }
 
-        internal void WriteSpawnCallForObject(PooledNetworkWriter writer, ulong clientId, NetworkObject networkObject, Stream payload)
+        internal void WriteSpawnCallForObject(PooledNetworkWriter writer, ulong clientId, NetworkObject networkObject)
         {
             writer.WriteBool(networkObject.IsPlayerObject);
             writer.WriteUInt64Packed(networkObject.NetworkObjectId);
@@ -437,24 +423,10 @@ internal void WriteSpawnCallForObject(PooledNetworkWriter writer, ulong clientId
                 var (isReparented, latestParent) = networkObject.GetNetworkParenting();
                 NetworkObject.WriteNetworkParenting(writer, isReparented, latestParent);
             }
-
-
-            writer.WriteBool(payload != null);
-
-            if (payload != null)
-            {
-                writer.WriteInt32Packed((int)payload.Length);
-            }
-
             if (NetworkManager.NetworkConfig.EnableNetworkVariable)
             {
                 networkObject.WriteNetworkVariableData(writer.GetStream(), clientId);
             }
-
-            if (payload != null)
-            {
-                payload.CopyTo(writer.GetStream());
-            }
         }
 
         internal void DespawnObject(NetworkObject networkObject, bool destroyObject = false)
@@ -583,7 +555,7 @@ internal void ServerSpawnSceneObjectsOnStartSweep()
                 {
                     if (networkObjects[i].IsSceneObject == null)
                     {
-                        SpawnNetworkObjectLocally(networkObjects[i], GetNetworkObjectId(), true, false, null, null, false, 0, false, true);
+                        SpawnNetworkObjectLocally(networkObjects[i], GetNetworkObjectId(), true, false, null, null, false, true);
                     }
                 }
             }
diff --git a/testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs b/testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs
@@ -350,7 +350,7 @@ private IEnumerator SpawnObjects()
                                 var no = go.GetComponent<NetworkObject>();
                                 if (!no.IsSpawned)
                                 {
-                                    no.Spawn(null, true);
+                                    no.Spawn(true);
                                 }
                             }
                         }
diff --git a/testproject/Assets/Tests/Manual/Scripts/StatsDisplay.cs b/testproject/Assets/Tests/Manual/Scripts/StatsDisplay.cs
@@ -66,7 +66,7 @@ private void OnClientConnectedCallback(ulong clientId)
                 var networkObject = GetComponent<NetworkObject>();
                 if (networkObject != null)
                 {
-                    networkObject.SpawnWithOwnership(clientId, null, true);
+                    networkObject.SpawnWithOwnership(clientId, true);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1415,7 +1415,7 @@ internal void HandleApproval(ulong ownerClientId, bool createPlayerObject, uint?`
`1415`	`1415`	`if (createPlayerObject)`
`1416`	`1416`	`{`
`1417`	`1417`	`var networkObject = SpawnManager.CreateLocalNetworkObject(false, playerPrefabHash ?? NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash, ownerClientId, null, position, rotation);`
`1418`		`- SpawnManager.SpawnNetworkObjectLocally(networkObject, SpawnManager.GetNetworkObjectId(), false, true, ownerClientId, null, false, 0, false, false);`
	`1418`	`+ SpawnManager.SpawnNetworkObjectLocally(networkObject, SpawnManager.GetNetworkObjectId(), false, true, ownerClientId, null, false, false);`
`1419`	`1419`
`1420`	`1420`	`ConnectedClients[ownerClientId].PlayerObject = networkObject;`
`1421`	`1421`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,10 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Runtime.CompilerServices;`
`6`		`-using MLAPI.Configuration;`
`7`	`6`	`using MLAPI.Exceptions;`
`8`	`7`	`using MLAPI.Hashing;`
`9`	`8`	`using MLAPI.Logging;`
`10`	`9`	`using MLAPI.Messaging;`
`11`		`-using MLAPI.Serialization.Pooled;`
`12`	`10`	`using MLAPI.Transports;`
`13`	`11`	`using MLAPI.Serialization;`
`14`	`12`	`using UnityEngine;`
`@@ -222,11 +220,10 @@ private void Awake()`
`222`	`220`	`}`
`223`	`221`
`224`	`222`	`/// <summary>`
`225`		`- /// Shows a previously hidden object to a client`
	`223`	`+ /// Shows a previously hidden <see cref="NetworkObject"/> to a client`
`226`	`224`	`/// </summary>`
`227`		`- /// <param name="clientId">The client to show the object to</param>`
`228`		`- /// <param name="payload">An optional payload to send as part of the spawn</param>`
`229`		`- public void NetworkShow(ulong clientId, Stream payload = null)`
	`225`	`+ /// <param name="clientId">The client to show the <see cref="NetworkObject"/> to</param>`
	`226`	`+ public void NetworkShow(ulong clientId)`
`230`	`227`	`{`
`231`	`228`	`if (!IsSpawned)`
`232`	`229`	`{`
`@@ -245,16 +242,15 @@ public void NetworkShow(ulong clientId, Stream payload = null)`
`245`	`242`
`246`	`243`	`Observers.Add(clientId);`
`247`	`244`
`248`		`- NetworkManager.SpawnManager.SendSpawnCallForObject(clientId, OwnerClientId, this, payload);`
	`245`	`+ NetworkManager.SpawnManager.SendSpawnCallForObject(clientId, OwnerClientId, this);`
`249`	`246`	`}`
`250`	`247`
`251`	`248`	`/// <summary>`
`252`		`- /// Shows a list of previously hidden objects to a client`
	`249`	`+ /// Shows a list of previously hidden <see cref="NetworkObject"/>s to a client`
`253`	`250`	`/// </summary>`
`254`		`- /// <param name="networkObjects">The objects to show</param>`
	`251`	`+ /// <param name="networkObjects">The <see cref="NetworkObject"/>s to show</param>`
`255`	`252`	`/// <param name="clientId">The client to show the objects to</param>`
`256`		`- /// <param name="payload">An optional payload to send as part of the spawns</param>`
`257`		`- public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientId, Stream payload = null)`
	`253`	`+ public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientId)`
`258`	`254`	`{`
`259`	`255`	`if (networkObjects == null \|\| networkObjects.Count == 0)`
`260`	`256`	`{`
`@@ -304,7 +300,7 @@ public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientI`
`304`	`300`	`networkObjects[i].Observers.Add(clientId);`
`305`	`301`
`306`	`302`	`networkManager.SpawnManager.WriteSpawnCallForObject(nonNullContext.NetworkWriter, clientId,`
`307`		`- networkObjects[i], payload);`
	`303`	`+ networkObjects[i]);`
`308`	`304`	`}`
`309`	`305`	`}`
`310`	`306`	`}`
`@@ -429,7 +425,7 @@ private void OnDestroy()`
`429`	`425`	`}`
`430`	`426`
`431`	`427`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`432`		`- private void SpawnInternal(Stream spawnPayload, bool destroyWithScene, ulong? ownerClientId, bool playerObject)`
	`428`	`+ private void SpawnInternal(bool destroyWithScene, ulong? ownerClientId, bool playerObject)`
`433`	`429`	`{`
`434`	`430`	`if (!NetworkManager.IsListening)`
`435`	`431`	`{`
`@@ -441,52 +437,44 @@ private void SpawnInternal(Stream spawnPayload, bool destroyWithScene, ulong? ow`
`441`	`437`	`throw new NotServerException($"Only server can spawn {nameof(NetworkObject)}s");`
`442`	`438`	`}`
`443`	`439`
`444`		`- if (spawnPayload != null)`
`445`		`- {`
`446`		`- spawnPayload.Position = 0;`
`447`		`- }`
`448`		`-`
`449`		`- NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.SpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene);`
	`440`	`+ NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.SpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId,null, false, destroyWithScene);`
`450`	`441`	`ulong ownerId = ownerClientId != null ? ownerClientId.Value : NetworkManager.ServerClientId;`
`451`	`442`	`for (int i = 0; i < NetworkManager.ConnectedClientsList.Count; i++)`
`452`	`443`	`{`
`453`	`444`	`if (Observers.Contains(NetworkManager.ConnectedClientsList[i].ClientId))`
`454`	`445`	`{`
`455`		`- NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.ConnectedClientsList[i].ClientId, ownerId, this, spawnPayload);`
	`446`	`+ NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.ConnectedClientsList[i].ClientId, ownerId, this);`
`456`	`447`	`}`
`457`	`448`	`}`
`458`	`449`	`}`
`459`	`450`
`460`	`451`	`/// <summary>`
`461`		`- /// Spawns this GameObject across the network. Can only be called from the Server`
	`452`	`+ /// Spawns this <see cref="NetworkObject"/> across the network. Can only be called from the Server`
`462`	`453`	`/// </summary>`
`463`		`- /// <param name="spawnPayload">The writer containing the spawn payload</param>`
`464`	`454`	`/// <param name="destroyWithScene">Should the object be destroyed when the scene is changed</param>`
`465`		`- public void Spawn(Stream spawnPayload = null, bool destroyWithScene = false)`
	`455`	`+ public void Spawn(bool destroyWithScene = false)`
`466`	`456`	`{`
`467`		`- SpawnInternal(spawnPayload, destroyWithScene, null, false);`
	`457`	`+ SpawnInternal(destroyWithScene, null, false);`
`468`	`458`	`}`
`469`	`459`
`470`	`460`	`/// <summary>`
`471`		`- /// Spawns an object across the network with a given owner. Can only be called from server`
	`461`	`+ /// Spawns a <see cref="NetworkObject"/> across the network with a given owner. Can only be called from server`
`472`	`462`	`/// </summary>`
`473`	`463`	`/// <param name="clientId">The clientId to own the object</param>`
`474`		`- /// <param name="spawnPayload">The writer containing the spawn payload</param>`
`475`		`- /// <param name="destroyWithScene">Should the object be destroyd when the scene is changed</param>`
`476`		`- public void SpawnWithOwnership(ulong clientId, Stream spawnPayload = null, bool destroyWithScene = false)`
	`464`	`+ /// <param name="destroyWithScene">Should the object be destroyed when the scene is changed</param>`
	`465`	`+ public void SpawnWithOwnership(ulong clientId, bool destroyWithScene = false)`
`477`	`466`	`{`
`478`		`- SpawnInternal(spawnPayload, destroyWithScene, clientId, false);`
	`467`	`+ SpawnInternal(destroyWithScene, clientId, false);`
`479`	`468`	`}`
`480`	`469`
`481`	`470`	`/// <summary>`
`482`		`- /// Spawns an object across the network and makes it the player object for the given client`
	`471`	`+ /// Spawns a <see cref="NetworkObject"/> across the network and makes it the player object for the given client`
`483`	`472`	`/// </summary>`
`484`	`473`	`/// <param name="clientId">The clientId whos player object this is</param>`
`485`		`- /// <param name="spawnPayload">The writer containing the spawn payload</param>`
`486`	`474`	`/// <param name="destroyWithScene">Should the object be destroyd when the scene is changed</param>`
`487`		`- public void SpawnAsPlayerObject(ulong clientId, Stream spawnPayload = null, bool destroyWithScene = false)`
	`475`	`+ public void SpawnAsPlayerObject(ulong clientId, bool destroyWithScene = false)`
`488`	`476`	`{`
`489`		`- SpawnInternal(spawnPayload, destroyWithScene, clientId, true);`
	`477`	`+ SpawnInternal(destroyWithScene, clientId, true);`
`490`	`478`	`}`
`491`	`479`
`492`	`480`	`/// <summary>`
`@@ -781,12 +769,12 @@ internal static void CheckOrphanChildren()`
`781`	`769`	`}`
`782`	`770`	`}`
`783`	`771`
`784`		`- internal void InvokeBehaviourNetworkSpawn(Stream stream)`
	`772`	`+ internal void InvokeBehaviourNetworkSpawn()`
`785`	`773`	`{`
`786`	`774`	`for (int i = 0; i < ChildNetworkBehaviours.Count; i++)`
`787`	`775`	`{`
`788`	`776`	`ChildNetworkBehaviours[i].InternalOnNetworkSpawn();`
`789`		`- ChildNetworkBehaviours[i].OnNetworkSpawn(stream);`
	`777`	`+ ChildNetworkBehaviours[i].OnNetworkSpawn();`
`790`	`778`	`}`
`791`	`779`	`}`
`792`	`780`
`@@ -1055,7 +1043,7 @@ internal static NetworkObject DeserializeSceneObject(NetworkBuffer objectStream,`
`1055`	`1043`	`}`
`1056`	`1044`
`1057`	`1045`	`// Spawn the NetworkObject`
`1058`		`- networkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, isSceneObject, isPlayerObject, ownerClientId, objectStream, false, 0, true, false);`
	`1046`	`+ networkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, isSceneObject, isPlayerObject, ownerClientId, objectStream, true, false);`
`1059`	`1047`
`1060`	`1048`	`return networkObject;`
`1061`	`1049`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,9 @@ public void HandleAddObject(ulong clientId, Stream stream)`
`164`	`164`
`165`	`165`	`var (isReparented, latestParent) = NetworkObject.ReadNetworkParenting(reader);`
`166`	`166`
`167`		`- var hasPayload = reader.ReadBool();`
`168`		`- var payLoadLength = hasPayload ? reader.ReadInt32Packed() : 0;`
`169`		`-`
`170`	`167`	`var networkObject = NetworkManager.SpawnManager.CreateLocalNetworkObject(softSync, prefabHash, ownerClientId, parentNetworkId, pos, rot, isReparented);`
`171`	`168`	`networkObject.SetNetworkParenting(isReparented, latestParent);`
`172`		`- NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, hasPayload, payLoadLength, true, false);`
	`169`	`+ NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, true, false);`
`173`	`170`	`}`
`174`	`171`	`}`
`175`	`172`
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ private void OnServerLoadedScene(Guid switchSceneGuid)`
`346`	`346`	`{`
`347`	`347`	`if (!keyValuePair.Value.IsPlayerObject)`
`348`	`348`	`{`
`349`		`- m_NetworkManager.SpawnManager.SpawnNetworkObjectLocally(keyValuePair.Value, m_NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, null, null, false, 0, false, true);`
	`349`	`+ m_NetworkManager.SpawnManager.SpawnNetworkObjectLocally(keyValuePair.Value, m_NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, null, null, false, true);`
`350`	`350`	`}`
`351`	`351`	`}`
`352`	`352`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ internal NetworkObject CreateLocalNetworkObject(bool isSceneObject, uint globalO`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`// Ran on both server and client`
`285`		`- internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong? ownerClientId, Stream dataStream, bool readPayload, int payloadLength, bool readNetworkVariable, bool destroyWithScene)`
	`285`	`+ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong? ownerClientId, Stream dataStream, bool readNetworkVariable, bool destroyWithScene)`
`286`	`286`	`{`
`287`	`287`	`if (networkObject == null)`
`288`	`288`	`{`
`@@ -350,24 +350,10 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong netwo`
`350`	`350`	`networkObject.SetCachedParent(networkObject.transform.parent);`
`351`	`351`	`networkObject.ApplyNetworkParenting();`
`352`	`352`	`NetworkObject.CheckOrphanChildren();`
`353`		`-`
`354`		`- if (readPayload)`
`355`		`- {`
`356`		`- using (var payloadBuffer = PooledNetworkBuffer.Get())`
`357`		`- {`
`358`		`- payloadBuffer.CopyUnreadFrom(dataStream, payloadLength);`
`359`		`- dataStream.Position += payloadLength;`
`360`		`- payloadBuffer.Position = 0;`
`361`		`- networkObject.InvokeBehaviourNetworkSpawn(payloadBuffer);`
`362`		`- }`
`363`		`- }`
`364`		`- else`
`365`		`- {`
`366`		`- networkObject.InvokeBehaviourNetworkSpawn(null);`
`367`		`- }`
	`353`	`+ networkObject.InvokeBehaviourNetworkSpawn();`
`368`	`354`	`}`
`369`	`355`
`370`		`- internal void SendSpawnCallForObject(ulong clientId, ulong ownerClientId, NetworkObject networkObject, Stream payload)`
	`356`	`+ internal void SendSpawnCallForObject(ulong clientId, ulong ownerClientId, NetworkObject networkObject)`
`371`	`357`	`{`
`372`	`358`	`//Currently, if this is called and the clientId (destination) is the server's client Id, this case`
`373`	`359`	`//will be checked within the below Send function. To avoid unwarranted allocation of a PooledNetworkBuffer`
`@@ -386,12 +372,12 @@ internal void SendSpawnCallForObject(ulong clientId, ulong ownerClientId, Networ`
`386`	`372`	`{`
`387`	`373`	`using (var nonNullContext = (InternalCommandContext)context)`
`388`	`374`	`{`
`389`		`- WriteSpawnCallForObject(nonNullContext.NetworkWriter, ownerClientId, networkObject, payload);`
	`375`	`+ WriteSpawnCallForObject(nonNullContext.NetworkWriter, ownerClientId, networkObject);`
`390`	`376`	`}`
`391`	`377`	`}`
`392`	`378`	`}`
`393`	`379`
`394`		`- internal void WriteSpawnCallForObject(PooledNetworkWriter writer, ulong clientId, NetworkObject networkObject, Stream payload)`
	`380`	`+ internal void WriteSpawnCallForObject(PooledNetworkWriter writer, ulong clientId, NetworkObject networkObject)`
`395`	`381`	`{`
`396`	`382`	`writer.WriteBool(networkObject.IsPlayerObject);`
`397`	`383`	`writer.WriteUInt64Packed(networkObject.NetworkObjectId);`
`@@ -437,24 +423,10 @@ internal void WriteSpawnCallForObject(PooledNetworkWriter writer, ulong clientId`
`437`	`423`	`var (isReparented, latestParent) = networkObject.GetNetworkParenting();`
`438`	`424`	`NetworkObject.WriteNetworkParenting(writer, isReparented, latestParent);`
`439`	`425`	`}`
`440`		`-`
`441`		`-`
`442`		`- writer.WriteBool(payload != null);`
`443`		`-`
`444`		`- if (payload != null)`
`445`		`- {`
`446`		`- writer.WriteInt32Packed((int)payload.Length);`
`447`		`- }`
`448`		`-`
`449`	`426`	`if (NetworkManager.NetworkConfig.EnableNetworkVariable)`
`450`	`427`	`{`
`451`	`428`	`networkObject.WriteNetworkVariableData(writer.GetStream(), clientId);`
`452`	`429`	`}`
`453`		`-`
`454`		`- if (payload != null)`
`455`		`- {`
`456`		`- payload.CopyTo(writer.GetStream());`
`457`		`- }`
`458`	`430`	`}`
`459`	`431`
`460`	`432`	`internal void DespawnObject(NetworkObject networkObject, bool destroyObject = false)`
`@@ -583,7 +555,7 @@ internal void ServerSpawnSceneObjectsOnStartSweep()`
`583`	`555`	`{`
`584`	`556`	`if (networkObjects[i].IsSceneObject == null)`
`585`	`557`	`{`
`586`		`- SpawnNetworkObjectLocally(networkObjects[i], GetNetworkObjectId(), true, false, null, null, false, 0, false, true);`
	`558`	`+ SpawnNetworkObjectLocally(networkObjects[i], GetNetworkObjectId(), true, false, null, null, false, true);`
`587`	`559`	`}`
`588`	`560`	`}`
`589`	`561`	`}`
Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ private IEnumerator SpawnObjects()`
`350`	`350`	`var no = go.GetComponent<NetworkObject>();`
`351`	`351`	`if (!no.IsSpawned)`
`352`	`352`	`{`
`353`		`- no.Spawn(null, true);`
	`353`	`+ no.Spawn(true);`
`354`	`354`	`}`
`355`	`355`	`}`
`356`	`356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private void OnClientConnectedCallback(ulong clientId)`
`66`	`66`	`var networkObject = GetComponent<NetworkObject>();`
`67`	`67`	`if (networkObject != null)`
`68`	`68`	`{`
`69`		`- networkObject.SpawnWithOwnership(clientId, null, true);`
	`69`	`+ networkObject.SpawnWithOwnership(clientId, true);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`