Merge branch 'main' of https://github.com/MirrorNG/KCPTransport into …

…main
MirageNet · Oct 12, 2020 · 98fd9e5 · 98fd9e5
2 parents 0f6b6aa + 45f6d20
commit 98fd9e5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 17 deletions.
diff --git a/Assets/KCP/CHANGELOG.md b/Assets/KCP/CHANGELOG.md
@@ -0,0 +1,6 @@
+# 1.0.0 (2020-10-12)
+
+
+### Performance Improvements
+
+* no need to await main thread ([de5699f](https://github.com/MirrorNG/KCPTransport/commit/de5699fd7abc67334916fde930ead69e9b718e56))
diff --git a/Assets/KCP/KcpClientConnection.cs b/Assets/KCP/KcpClientConnection.cs
@@ -1,10 +1,7 @@
-using System;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
 using Cysharp.Threading.Tasks;
-using UnityEngine;
 
 namespace Mirror.KCP
 {

diff --git a/Assets/KCP/KcpConnection.cs b/Assets/KCP/KcpConnection.cs
@@ -14,13 +14,13 @@ public abstract class KcpConnection : IConnection
         protected Socket socket;
         protected EndPoint remoteEndpoint;
         protected KCP kcp;
-        private volatile bool open;
+        volatile bool open;
 
         // If we don't receive anything these many milliseconds
         // then consider us disconnected
         public const int TIMEOUT = 3000;
 
-        private volatile uint lastReceived = 0;
+        volatile uint lastReceived = 0;
 
         internal static readonly ArraySegment<byte> Hello = new ArraySegment<byte>(new byte[] { 0 });
         private static readonly ArraySegment<byte> Goodby = new ArraySegment<byte>(new byte[] { 1 });
@@ -38,7 +38,7 @@ protected void SetupKcp()
             _ = Tick();
         }
 
-        private async UniTask Tick()
+        async UniTask Tick()
         {
             try
             {

diff --git a/Assets/KCP/KcpServerConnection.cs b/Assets/KCP/KcpServerConnection.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Sockets;
-using UnityEngine;
 
 namespace Mirror.KCP
 {

diff --git a/Assets/KCP/KcpTransport.cs b/Assets/KCP/KcpTransport.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
@@ -66,12 +65,6 @@ void RawInput(EndPoint endpoint, byte[] data, int msgLength)
         /// </summary>
         public override void Disconnect()
         {
-            // disconnect all connections and stop listening to the port
-            /*foreach (KcpServerConnection connection in connectedClients.Values)
-            {
-                connection.Disconnect();
-            }*/
-
             socket?.Close();
             socket = null;
         }

diff --git a/Assets/KCP/Segment.cs b/Assets/KCP/Segment.cs
@@ -20,7 +20,7 @@ internal class Segment
         internal bool acked;
         internal ByteBuffer data;
 
-        private static readonly Stack<Segment> msSegmentPool = new Stack<Segment>(32);
+        static readonly Stack<Segment> msSegmentPool = new Stack<Segment>(32);
 
         public static Segment Get(int size)
         {
@@ -39,7 +39,7 @@ public static void Put(Segment seg)
             msSegmentPool.Push(seg);
         }
 
-        private Segment(int size)
+        Segment(int size)
         {
             data = ByteBuffer.Allocate(size, true);
         }

diff --git a/Assets/KCP/package.json b/Assets/KCP/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.mirrorng.kcptransport",
     "displayName": "MirrorNG KCPTransport",
-    "version": "1.1.0",
+    "version": "1.0.0",
     "unity": "2019.1",
     "description": "UDP transport for MirrorNG",
     "author": "Paul Pacheco",