Fixed local read issue on host RPCs

TwoTenPvP · TwoTenPvP · commit 09ebb6dc4fd6 · 2018-07-24T12:48:57.000+02:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs b/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
@@ -571,7 +571,11 @@ internal void SendServerRPCPerformance(ulong hash, Stream messageStream)
 		        
 		        if (isHost)
 		        {
-			        InvokeServerRPCLocal(hash, NetworkingManager.singleton.LocalClientId, messageStream);
+					using (PooledBitStream localStream = PooledBitStream.Get())
+					{
+						localStream.CopyFrom(messageStream);
+						InvokeServerRPCLocal(hash, NetworkingManager.singleton.LocalClientId, localStream);
+					}
 		        }
             
 		        InternalMessageHandler.Send(NetworkingManager.singleton.NetworkConfig.NetworkTransport.ServerNetId, "MLAPI_SERVER_RPC", "MLAPI_DEFAULT_MESSAGE", stream);
@@ -616,7 +620,11 @@ internal void SendClientRPCPerformance(ulong hash,  List<uint> clientIds, Stream
                     {
                         if (isHost && clientIds[i] == NetworkingManager.singleton.LocalClientId)
                         {
-                            InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, messageStream);
+	                        using (PooledBitStream localStream = PooledBitStream.Get())
+	                        {
+								localStream.CopyFrom(messageStream);
+								InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, localStream);   
+	                        }
                         }
                         else
                         {
@@ -647,7 +655,11 @@ internal void SendClientRPCPerformance(ulong hash, uint clientId, Stream message
 
                 if (isHost && clientId == NetworkingManager.singleton.LocalClientId)
                 {
-                    InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, messageStream);
+					using (PooledBitStream localStream = PooledBitStream.Get())
+					{
+						localStream.CopyFrom(messageStream);
+						InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, localStream);
+					}
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,11 @@ internal void SendServerRPCPerformance(ulong hash, Stream messageStream)`
`571`	`571`
`572`	`572`	`if (isHost)`
`573`	`573`	`{`
`574`		`- InvokeServerRPCLocal(hash, NetworkingManager.singleton.LocalClientId, messageStream);`
	`574`	`+ using (PooledBitStream localStream = PooledBitStream.Get())`
	`575`	`+ {`
	`576`	`+ localStream.CopyFrom(messageStream);`
	`577`	`+ InvokeServerRPCLocal(hash, NetworkingManager.singleton.LocalClientId, localStream);`
	`578`	`+ }`
`575`	`579`	`}`
`576`	`580`
`577`	`581`	`InternalMessageHandler.Send(NetworkingManager.singleton.NetworkConfig.NetworkTransport.ServerNetId, "MLAPI_SERVER_RPC", "MLAPI_DEFAULT_MESSAGE", stream);`
`@@ -616,7 +620,11 @@ internal void SendClientRPCPerformance(ulong hash, List<uint> clientIds, Stream`
`616`	`620`	`{`
`617`	`621`	`if (isHost && clientIds[i] == NetworkingManager.singleton.LocalClientId)`
`618`	`622`	`{`
`619`		`- InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, messageStream);`
	`623`	`+ using (PooledBitStream localStream = PooledBitStream.Get())`
	`624`	`+ {`
	`625`	`+ localStream.CopyFrom(messageStream);`
	`626`	`+ InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, localStream);`
	`627`	`+ }`
`620`	`628`	`}`
`621`	`629`	`else`
`622`	`630`	`{`
`@@ -647,7 +655,11 @@ internal void SendClientRPCPerformance(ulong hash, uint clientId, Stream message`
`647`	`655`
`648`	`656`	`if (isHost && clientId == NetworkingManager.singleton.LocalClientId)`
`649`	`657`	`{`
`650`		`- InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, messageStream);`
	`658`	`+ using (PooledBitStream localStream = PooledBitStream.Get())`
	`659`	`+ {`
	`660`	`+ localStream.CopyFrom(messageStream);`
	`661`	`+ InvokeClientRPCLocal(hash, NetworkingManager.singleton.LocalClientId, localStream);`
	`662`	`+ }`
`651`	`663`	`}`
`652`	`664`	`else`
`653`	`665`	`{`