Unstable 1.8.4.0

2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
@@ -74,7 +74,16 @@ sealed class SteamConnectSocket : P2PSocket
    {
        if (!SteamManager.IsInitialized) { return Result.Failure(new Error(ErrorCode.SteamNotInitialized)); }

-        var connectionManager = Steamworks.SteamNetworkingSockets.ConnectRelay<ConnectionManager>(endpoint.SteamId.Value);
+        ConnectionManager connectionManager;
+        try
+        {
+            connectionManager = Steamworks.SteamNetworkingSockets.ConnectRelay<ConnectionManager>(endpoint.SteamId.Value);
+        }
+        catch (ArgumentException e)
+        {
+            DebugConsole.ThrowError("Failed to connect via SteamP2P. Are you logged in to Steam, is the same Steam account already connected to the server?", e);
+            return Result.Failure(new Error(ErrorCode.FailedToCreateSteamP2PSocket));
+        }
        if (connectionManager is null) { return Result.Failure(new Error(ErrorCode.FailedToCreateSteamP2PSocket)); }
        connectionManager.SetEndpointAndCallbacks(endpoint, callbacks);

@@ -68,7 +68,7 @@ sealed class SteamListenSocket : P2PSocket
        
        public override void OnMessage(Steamworks.Data.Connection connection, Steamworks.Data.NetIdentity identity, IntPtr data, int size, long messageNum, long recvTime, int channel)
        {
-            if (!identity.IsSteamId) { return; }
+            if (!identity.IsSteamId || data == IntPtr.Zero) { return; }
            var endpoint = new SteamP2PEndpoint(new SteamId((Steamworks.SteamId)identity));

            var dataArray = new byte[size];