charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vis2k/Mirror

Browse Source
This commit is contained in:
Chris Langsenkamp 2019-10-07 06:41:35 -04:00
commit 98b6328f76
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Mirror/Runtime/Transport/Telepathy/Client.cs
View File

@ -99,7 +99,7 @@ void ReceiveThreadFunction(string ip, int port)
// if we got here then we are done. ReceiveLoop cleans up already, // if we got here then we are done. ReceiveLoop cleans up already,
// but we may never get there if connect fails. so let's clean up // but we may never get there if connect fails. so let's clean up
// here too. // here too.
client.Close(); client?.Close();
} }
public void Connect(string ip, int port) public void Connect(string ip, int port)

2
Assets/Mirror/Runtime/Transport/Telepathy/SafeQueue.cs
View File

@ -42,7 +42,7 @@ public bool TryDequeue(out T result)
{ {
lock(queue) lock(queue)
{ {
result = default; result = default(T);
if (queue.Count > 0) if (queue.Count > 0)
{ {
result = queue.Dequeue(); result = queue.Dequeue();

4
Assets/Mirror/Runtime/Transport/Telepathy/Server.cs
View File

@ -230,6 +230,10 @@ public void Stop()
// clear clients list // clear clients list
clients.Clear(); clients.Clear();
// reset the counter in case we start up again so
// clients get connection ID's starting from 1
counter = 0;
} }
// send message to client using socket connection. // send message to client using socket connection.