v0.10.5.1

Barotrauma/BarotraumaShared/SharedSource/Networking/Primitives/NetworkConnection/LidgrenConnection.cs

@@ -33,5 +33,16 @@ namespace Barotrauma.Networking
             SteamID = steamId;
             EndPointString = IPString;
         }
+
+        public override bool EndpointMatches(string endPoint)
+        {
+            if (IPEndPoint?.Address == null) { return false; }
+            if (!IPAddress.TryParse(endPoint, out IPAddress addr)) { return false; }
+
+            IPAddress ip1 = IPEndPoint.Address.IsIPv4MappedToIPv6 ? IPEndPoint.Address.MapToIPv4() : IPEndPoint.Address;
+            IPAddress ip2 = addr.IsIPv4MappedToIPv6 ? addr.MapToIPv4() : addr;
+
+            return ip1.ToString() == ip2.ToString();
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Networking/Primitives/NetworkConnection/NetworkConnection.cs

@@ -27,6 +27,13 @@ namespace Barotrauma.Networking
             protected set;
         }
 
+        public string Language
+        {
+            get; set;
+        }
+
+        public abstract bool EndpointMatches(string endPoint);
+
         public NetworkConnectionStatus Status = NetworkConnectionStatus.Disconnected;
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Networking/Primitives/NetworkConnection/PipeConnection.cs

@@ -1,12 +1,19 @@
-using System;
+using Barotrauma.Steam;
+using System;
 
 namespace Barotrauma.Networking
 {
     public class PipeConnection : NetworkConnection
     {
-        public PipeConnection()
+        public PipeConnection(ulong steamId)
         {
             EndPointString = "PIPE";
+            SteamID = steamId;
+        }
+
+        public override bool EndpointMatches(string endPoint)
+        {
+            return SteamManager.SteamIDStringToUInt64(endPoint) == SteamID || endPoint == "PIPE";
         }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Networking/Primitives/NetworkConnection/SteamP2PConnection.cs

@@ -1,4 +1,5 @@
-using System;
+using Barotrauma.Steam;
+using System;
 
 namespace Barotrauma.Networking
 {
@@ -9,7 +10,7 @@ namespace Barotrauma.Networking
         public SteamP2PConnection(string name, UInt64 steamId)
         {
             SteamID = steamId;
-            EndPointString = SteamID.ToString();
+            EndPointString = SteamManager.SteamIDUInt64ToString(SteamID);
             Name = name;
             Heartbeat();
         }
@@ -23,5 +24,10 @@ namespace Barotrauma.Networking
         {
             Timeout = TimeoutThreshold;
         }
+
+        public override bool EndpointMatches(string endPoint)
+        {
+            return SteamManager.SteamIDStringToUInt64(endPoint) == SteamID;
+        }
     }
 }