Unstable v0.19.1.0

Barotrauma/BarotraumaShared/SharedSource/Networking/BanList.cs

@@ -1,37 +1,34 @@
-using Barotrauma.Steam;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Barotrauma.Networking
 {
+    #warning TODO: turn this into INetSerializableStruct
     partial class BannedPlayer
     {
-        public string Name;
-        public string EndPoint; public bool IsRangeBan;
-        public UInt64 SteamID;
-        public string Reason;
-        public DateTime? ExpirationTime;
-        public UInt16 UniqueIdentifier;
+        public readonly string Name;
+        public readonly Either<Address, AccountId> AddressOrAccountId;
 
-        private void ParseEndPointAsSteamId()
-        {
-            ulong endPointAsSteamId = SteamManager.SteamIDStringToUInt64(EndPoint);
-            if (endPointAsSteamId != 0 && SteamID == 0) { SteamID = endPointAsSteamId; }
-        }
+        public readonly string Reason;
+        public DateTime? ExpirationTime;
+        public readonly UInt32 UniqueIdentifier;
     }
 
     partial class BanList
     {
         private readonly List<BannedPlayer> bannedPlayers;
+
+        public IReadOnlyList<BannedPlayer> BannedPlayers => bannedPlayers;
+        
         public IEnumerable<string> BannedNames
         {
             get { return bannedPlayers.Select(bp => bp.Name); }
         }
 
-        public IEnumerable<string> BannedEndPoints
+        public IEnumerable<Either<Address, AccountId>> BannedAddresses
         {
-            get { return bannedPlayers.Select(bp => bp.EndPoint).Where(endPoint => !string.IsNullOrEmpty(endPoint)); }
+            get { return bannedPlayers.Select(bp => bp.AddressOrAccountId); }
         }
 
         partial void InitProjectSpecific();
@@ -42,19 +39,5 @@ namespace Barotrauma.Networking
             bannedPlayers = new List<BannedPlayer>();
             InitProjectSpecific();
         }
-
-        public static string ToRange(string ip)
-        {
-            if (SteamManager.SteamIDStringToUInt64(ip) != 0) { return ip; }
-            for (int i = ip.Length - 1; i > 0; i--)
-            {
-                if (ip[i] == '.')
-                {
-                    ip = ip.Substring(0, i) + ".x";
-                    break;
-                }
-            }
-            return ip;
-        }
     }
 }