NETC-8

Left out the SpawnManager changes (PR #407) which was merged into the RPC queue branch prior to the migration.

Author: NoelStephensUnity

com.unity.multiplayer.mlapi/Runtime/Spawning/SpawnManager.cs

@@ -193,7 +193,7 @@ internal static void RemoveOwnership(NetworkedObject netObject)
                     writer.WriteUInt64Packed(netObject.NetworkId);
                     writer.WriteUInt64Packed(netObject.OwnerClientId);
 
-                    InternalMessageSender.Send(MLAPIConstants.MLAPI_CHANGE_OWNER, "MLAPI_INTERNAL", stream, SecuritySendFlags.None, netObject);
+                    InternalMessageSender.Send(MLAPIConstants.MLAPI_CHANGE_OWNER, "MLAPI_INTERNAL", stream, SecuritySendFlags.None);
                 }
             }
         }
@@ -229,7 +229,7 @@ internal static void ChangeOwnership(NetworkedObject netObject, ulong clientId)
                     writer.WriteUInt64Packed(netObject.NetworkId);
                     writer.WriteUInt64Packed(clientId);
 
-                    InternalMessageSender.Send(MLAPIConstants.MLAPI_CHANGE_OWNER, "MLAPI_INTERNAL", stream, SecuritySendFlags.None, netObject);
+                    InternalMessageSender.Send(MLAPIConstants.MLAPI_CHANGE_OWNER, "MLAPI_INTERNAL", stream, SecuritySendFlags.None);
                 }
             }
         }
@@ -402,12 +402,41 @@ internal static void SpawnNetworkedObjectLocally(NetworkedObject netObject, ulon
 
         internal static void SendSpawnCallForObject(ulong clientId, NetworkedObject netObject, Stream payload)
         {
-            using (PooledBitStream stream = PooledBitStream.Get())
+
+            //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 PooledBitStream
+            //placing this check here. [NSS]
+            if (NetworkingManager.Singleton.IsServer && clientId == NetworkingManager.Singleton.ServerClientId)
             {
+                return;
+            }
+
+            RPCQueueManager rpcQueueManager = NetworkingManager.Singleton.GetRPCQueueManager();
+            if(rpcQueueManager != null)
+            { 
+
+                PooledBitStream stream = PooledBitStream.Get();
                 WriteSpawnCallForObject(stream, clientId, netObject, payload);
 
-                InternalMessageSender.Send(clientId, MLAPIConstants.MLAPI_ADD_OBJECT, "MLAPI_INTERNAL", stream, SecuritySendFlags.None, null);
+
+                FrameQueueItem QueueItem = new FrameQueueItem();
+                QueueItem.QueueItemType = RPCQueueManager.QueueItemType.CreateObject;
+                QueueItem.NetworkId = 0;
+                QueueItem.ItemStream = stream;
+                QueueItem.Channel = "MLAPI_INTERNAL";
+                QueueItem.SendFlags = SecuritySendFlags.None;
+                //QueueItem.NetworkObject = null;
+                QueueItem.ClientIds = new List<ulong>() { clientId };
+                rpcQueueManager.AddToInternalMLAPISendQueue(QueueItem);
+
+
+                //using (PooledBitStream stream = PooledBitStream.Get())
+                //{
+                //    WriteSpawnCallForObject(stream, clientId, netObject, payload);
+                //    InternalMessageSender.Send(clientId, MLAPIConstants.MLAPI_ADD_OBJECT, "MLAPI_INTERNAL", stream, SecuritySendFlags.None, null);
+                //}
             }
+
         }
 
         internal static void WriteSpawnCallForObject(Serialization.BitStream stream, ulong clientId, NetworkedObject netObject, Stream payload)
@@ -635,15 +664,30 @@ internal static void OnDestroyObject(ulong networkId, bool destroyGameObject)
                     });
                 }
 
-                if (sobj != null)
-                {
-                    using (PooledBitStream stream = PooledBitStream.Get())
+                RPCQueueManager rpcQueueManager = NetworkingManager.Singleton.GetRPCQueueManager();
+                if(rpcQueueManager != null)
+                { 
+
+                    if (sobj != null)
                     {
-                        using (PooledBitWriter writer = PooledBitWriter.Get(stream))
+                        // As long as we have any remaining clients, then notify of the object being destroy.
+                        if(InternalMessageSender.GetAllClientIds() != null)
                         {
+                            PooledBitStream stream = PooledBitStream.Get();
+                            PooledBitWriter writer = PooledBitWriter.Get(stream);
                             writer.WriteUInt64Packed(networkId);
 
-                            InternalMessageSender.Send(MLAPIConstants.MLAPI_DESTROY_OBJECT, "MLAPI_INTERNAL", stream, SecuritySendFlags.None, SpawnedObjects[networkId]);
+
+                            FrameQueueItem QueueItem = new FrameQueueItem();
+                            QueueItem.QueueItemType = RPCQueueManager.QueueItemType.DestroyObject;
+                            QueueItem.NetworkId = networkId;
+                            QueueItem.ItemStream = stream;
+                            QueueItem.Channel = "MLAPI_INTERNAL";
+                            QueueItem.SendFlags = SecuritySendFlags.None;                       
+                            QueueItem.ClientIds = InternalMessageSender.GetAllClientIds();
+                            rpcQueueManager.AddToInternalMLAPISendQueue(QueueItem);
+
+                            writer.Dispose();
                         }
                     }
                 }