Revert "Merge branch 'feature/rpcqueuerevisited' into feature/networkupdate"

This reverts commit 5d75987, reversing
changes made to 39f0502.

Author: NoelStephensUnity

com.unity.multiplayer.mlapi/Runtime/Core/MessageBatcher.cs

@@ -1,7 +1,3 @@
-/// About the Network Update Loop
-/// The NetworkUpdateEngine is a temporary solution for the network update loop implementation.
-/// This will be revised with a more robust and modular implementation in the near future.
-
 using System;
 using System.Text;
 using System.Collections.Generic;

com.unity.multiplayer.mlapi/Runtime/Core/MessageBatcher.cs.meta

@@ -38,9 +38,6 @@ internal enum NExec
             Client = 2
         }
 
-        /// <summary>
-        /// This is a temporary solution for channel names and the below hardcoded value might not be mandatory in the future.
-        /// </summary>
         private const string StandardRpc_ChannelName = "STDRPC";
 
 #pragma warning disable 414
@@ -52,8 +49,17 @@ internal enum NExec
         internal BitWriter BeginSendServerRpc(ServerRpcSendParams sendParams, bool isReliable)
         {
             var rpcQueueMananger = NetworkingManager.Singleton.RpcQueueManager;
+            if (rpcQueueMananger == null)
+            {
+                return null;
+            }
+
+            var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RPCQueueManager.QueueItemType.ServerRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkingManager.Singleton.ServerClientId, null);
+            writer.WriteBit(false); // Encrypted
+            writer.WriteBit(false); // Authenticated
+            writer.WriteBits(MLAPIConstants.MLAPI_SERVER_RPC, 6); // MessageType
+
 
-            var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RpcQueueContainer.QueueItemType.ServerRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkingManager.Singleton.ServerClientId, null);
             writer.WriteUInt64Packed(NetworkId); // NetworkObjectId
             writer.WriteUInt16Packed(GetBehaviourId()); // NetworkBehaviourId
 
@@ -84,8 +90,30 @@ internal BitWriter BeginSendClientRpc(ClientRpcSendParams sendParams, bool isRel
         {
             //This will start a new queue item entry and will then return the writer to the current frame's stream
             var rpcQueueMananger = NetworkingManager.Singleton.RpcQueueManager;
+            if (rpcQueueMananger == null)
+            {
+                return null;
+            }
+
+            ulong[] TargetIds = sendParams.TargetClientIds;
+            if(TargetIds == null)
+            {
+                if((NetworkingManager.Singleton.ConnectedClientsList.Count > 0))
+                {
+                    var FirstPass = NetworkingManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToList();
+                    FirstPass.Remove(NetworkingManager.Singleton.ServerClientId);
+                    TargetIds = FirstPass.ToArray();
+                }
+            }
+
+            //var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RPCQueueManager.QueueItemType.ClientRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkId, sendParams.TargetClientIds ?? NetworkingManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray());
+            var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RPCQueueManager.QueueItemType.ClientRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkId, TargetIds);
+            writer.WriteBit(false); // Encrypted
+            writer.WriteBit(false); // Authenticated
+            writer.WriteBits(MLAPIConstants.MLAPI_CLIENT_RPC, 6); // MessageType
+
+
 
-            var writer = rpcQueueMananger.BeginAddQueueItemToOutboundFrame(RpcQueueContainer.QueueItemType.ClientRpc, Time.realtimeSinceStartup, StandardRpc_ChannelName, 0, NetworkId, sendParams.TargetClientIds ?? NetworkingManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray());
             writer.WriteUInt64Packed(NetworkId); // NetworkObjectId
             writer.WriteUInt16Packed(GetBehaviourId()); // NetworkBehaviourId