From 75fd623b49b53886e6023e11592267ea06d8121d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albin=20Cor=C3=A9n?= <2108U9@gmail.com> Date: Wed, 21 Mar 2018 14:10:12 +0100 Subject: [PATCH] Fixed issue preventing internal handshake to be sent --- MLAPI/MonoBehaviours/Core/NetworkingManager.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs index 9ea41d1..99dd27b 100644 --- a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs +++ b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs @@ -369,7 +369,7 @@ namespace MLAPI writer.Write(NetworkConfig.ConnectionData); } } - Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_INTERNAL", writeStream.GetBuffer()); + Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_INTERNAL", writeStream.GetBuffer(), null, true); } } break; @@ -866,7 +866,7 @@ namespace MLAPI } } - internal void Send(int clientId, string messageType, string channelName, byte[] data, uint? networkId = null) + internal void Send(int clientId, string messageType, string channelName, byte[] data, uint? networkId = null, bool skipQueue = false) { if(clientId == -1 && isHost) { @@ -910,7 +910,10 @@ namespace MLAPI } if (isPassthrough) clientId = serverClientId; - NetworkTransport.QueueMessageForSending(hostId, clientId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error); + if (skipQueue) + NetworkTransport.Send(hostId, clientId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error); + else + NetworkTransport.QueueMessageForSending(hostId, clientId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error); } } @@ -1185,7 +1188,7 @@ namespace MLAPI } } } - Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writeStream.GetBuffer()); + Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writeStream.GetBuffer(), null, true); } //Inform old clients of the new player