- Applied FirstGearGames fix

TiToMoskito · May 9, 2022 · 977fa2c · jacobc16 · May 21, 2022 · 977fa2c
1 parent 07852bb
commit 977fa2c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/FishNet/Plugins/FishyFacepunch/Core/ServerSocket.cs b/FishNet/Plugins/FishyFacepunch/Core/ServerSocket.cs
@@ -381,19 +381,26 @@ internal void SetClientHostSocket(ClientHostSocket socket)
         /// </summary>
         internal void OnClientHostState(bool started)
         {
+
             _clientHostStarted = started;
+            FishyFacepunch ff = (FishyFacepunch)base.Transport;
+            SteamId steamId = new SteamId()
+            {
+                Value = ff.LocalUserSteamID
+            };
+
             //If not started flush incoming from local client.
             if (!started)
             {
                 base.ClearQueue(_clientHostIncoming);
                 base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Stopped, FishyFacepunch.CLIENT_HOST_ID, Transport.Index));
+                _steamIds.Remove(steamId);
             }
             else
             {
+                _steamIds[steamId] = FishyFacepunch.CLIENT_HOST_ID;
                 base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Started, FishyFacepunch.CLIENT_HOST_ID, Transport.Index));
             }
-
-
         }
         /// <summary>
         /// Queues a received packet from the local client.

diff --git a/FishNet/Plugins/FishyFacepunch/FishyFacepunch.cs b/FishNet/Plugins/FishyFacepunch/FishyFacepunch.cs
@@ -9,6 +9,11 @@ namespace FishyFacepunch
 {
     public class FishyFacepunch : Transport
     {
+        #region Public.
+        [System.NonSerialized]
+        public ulong LocalUserSteamID;
+        #endregion
+
         #region Serialized.
         /// <summary>
         /// Steam application Id.
@@ -124,8 +129,9 @@ private void InitializeRelayNetworkAccess()
         {
 #if !UNITY_SERVER
             SteamNetworkingUtils.InitRelayNetworkAccess();
+            LocalUserSteamID = Steamworks.SteamClient.SteamId.Value;
 #endif
-        }
+        } 
         #endregion
 
         #region ConnectionStates.
@@ -211,7 +217,7 @@ public override void IterateIncoming(bool server)
             {
                 _client.IterateIncoming();
                 _clientHost.IterateIncoming();
-            }                
+            }
         }
 
         /// <summary>
@@ -302,11 +308,7 @@ public override void SetClientAddress(string address)
         {
             _clientAddress = address;
         }
-        /// <summary>
-        /// Sets which address the server will bind to.
-        /// </summary>
-        /// <param name="address"></param>
-        public override void SetServerBindAddress(string address)
+        public override void SetServerBindAddress(string address, IPAddressType addressType)
         {
             _serverBindAddress = address;
         }
@@ -335,6 +337,8 @@ public override float GetTimeout(bool asServer)
         /// <param name="server">True to start server.</param>
         public override bool StartConnection(bool server)
         {
+            Debug.Log("StartConnection fishy server: " + server);
+
             if (server)
                 return StartServer();
             else
@@ -451,7 +455,7 @@ private bool StartClient(string address)
                     _clientHost.StopConnection();
                 //Initialize.
                 InitializeRelayNetworkAccess();
-                
+
                 _client.StartConnection(address, _port);
             }
             //Acting as host.