Make more use of IDisposable

Author: valkyrienyanko

Scripts/Netcode/Client/ENetClient.cs

@@ -11,14 +11,14 @@
 
 namespace GodotModules.Netcode.Client
 {
-    public abstract class ENetClient
+    public abstract class ENetClient : IDisposable
     {
         // values grabbed from the server
         // =========================================================
         public static uint PeerId { get; set; } // this clients peer id (grabbed from server at some point)
         public static bool IsHost { get; set; }
         // =========================================================
-        public static CancellationTokenSource CancelTokenSource { get; private set; }
+        private static CancellationTokenSource CancelTokenSource { get; set; }
         public static ConsoleColor LogsColor = ConsoleColor.Yellow;
         public static ConcurrentQueue<ENetCmd> ENetCmds { get; set; }
         private static int OutgoingId { get; set; }
@@ -245,5 +245,10 @@ protected virtual void Disconnect(Event netEvent) { }
         /// </summary>
         /// <param name="netEvent"></param>
         protected virtual void Timeout(Event netEvent) { }
+
+        public void Dispose()
+        {
+            CancelTokenSource.Dispose();
+        }
     }
 }

Scripts/Netcode/Server/ENetServer.cs

@@ -12,9 +12,9 @@
 
 namespace GodotModules.Netcode.Server
 {
-    public abstract class ENetServer
+    public abstract class ENetServer : IDisposable
     {
-        public static CancellationTokenSource CancelTokenSource { get; private set; }
+        private static CancellationTokenSource CancelTokenSource { get; set; }
         public static ConsoleColor LogsColor = ConsoleColor.Cyan;
         public static bool SomeoneConnected { get; set; }
         public static bool Running { get; set; }
@@ -319,5 +319,10 @@ private static void Kick(uint id, DisconnectOpcode opcode)
             Peers[id].DisconnectNow((uint)opcode);
             Peers.Remove(id);
         }
+
+        public void Dispose()
+        {
+            CancelTokenSource.Dispose();
+        }
     }
 }

Scripts/Scenes/Main/NetworkManager.cs

@@ -118,22 +118,19 @@ private static async Task ExitCleanup()
 
             ClientConnectingTokenSource?.Dispose();
 
-            ENetClient.CancelTokenSource?.Dispose();
-            ENetServer.CancelTokenSource?.Dispose();
-
-            //ClientPlayer.EmitPosition?.Dispose();
-
             Instance.GetTree().Quit();
         }
 
         public static async void StartClient(string ip, ushort port)
         {
+            GameClient?.Dispose();
             GameClient = new GameClient();
             await GameClient.Connect(ip, port);
         }
 
         public static async void StartServer(ushort port, int maxClients)
         {
+            GameServer?.Dispose();
             GameServer = new GameServer();
             await GameServer.Start(port, maxClients);
         }