Merge pull request #6 from WolffunGame/feature/fix_exception

Feature/fix exception
WolffunGame · Oct 23, 2023 · a263c96 · a263c96
2 parents eead45d + cd8e4e5
commit a263c96
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/Assets/FishNet/Runtime/Managing/Server/ServerManager.cs b/Assets/FishNet/Runtime/Managing/Server/ServerManager.cs
@@ -410,8 +410,24 @@ private void Transport_OnRemoteConnectionState(RemoteConnectionStateArgs args)
                 {
                     NetworkManager.Log($"Remote connection started for Id {id}.");
                     NetworkConnection conn = new NetworkConnection(NetworkManager, id, args.TransportIndex, true);
-                    Clients.Add(args.ConnectionId, conn);
-                    OnRemoteConnectionState?.Invoke(conn, args);
+
+                    if(Clients.TryGetValue(args.ConnectionId, out var prevConn))
+                    {
+                        // Some error occured, that still connection in Dictionary
+                        Clients.Remove(args.ConnectionId);
+                    }
+
+                    Clients.TryAdd(args.ConnectionId, conn);
+
+                    try
+                    {
+                        OnRemoteConnectionState?.Invoke(conn, args);
+                    }
+                    catch (Exception ex)
+                    {
+                        NetworkManager.LogError($"Exception occured when do OnRemoteConnectionState callback: {ex.Message}");
+                    }
+
                     //Connection is no longer valid. This can occur if the user changes the state using the OnRemoteConnectionState event.
                     if (!conn.IsValid)
                         return;
@@ -431,7 +447,15 @@ private void Transport_OnRemoteConnectionState(RemoteConnectionStateArgs args)
                     if (Clients.TryGetValueIL2CPP(id, out NetworkConnection conn))
                     {
                         conn.SetDisconnecting(true);
-                        OnRemoteConnectionState?.Invoke(conn, args);
+
+                        try
+                        {
+                            OnRemoteConnectionState?.Invoke(conn, args);
+                        }
+                        catch (Exception ex)
+                        {
+                            NetworkManager.LogError($"Exception occured when do OnRemoteConnectionState callback: {ex.Message}");
+                        }
                         Clients.Remove(id);
                         Objects.ClientDisconnected(conn);
                         BroadcastClientConnectionChange(false, conn);

diff --git a/Assets/FishNet/package.json b/Assets/FishNet/package.json
@@ -2,7 +2,7 @@
   "name": "com.fishnet",
   "displayName": "FishNet - Unity Networking Evolved",
   "description": "FishNet - Unity Networking Evolved",
-  "version": "3.7.26",
+  "version": "3.7.27",
   "unity": "2021.3",
   "license": "MIT",
   "repository": {