Unstable v0.1300.0.0 (February 19th 2021)

2021-02-25 13:44:23 +02:00
parent b772654326
commit 24cbef485a
441 changed files with 21343 additions and 8562 deletions
@@ -378,8 +378,8 @@ namespace Barotrauma.Networking

            if (maxPlayersElement > NetConfig.MaxPlayers)
            {
-                DebugConsole.IsOpen = true;
-                DebugConsole.NewMessage($"Setting the maximum amount of players to {maxPlayersElement} failed due to exceeding the limit of {NetConfig.MaxPlayers} players per server. Using the maximum of {NetConfig.MaxPlayers} instead.", Color.Red);
+                /*DebugConsole.IsOpen = true;
+                DebugConsole.NewMessage($"Setting the maximum amount of players to {maxPlayersElement} failed due to exceeding the limit of {NetConfig.MaxPlayers} players per server. Using the maximum of {NetConfig.MaxPlayers} instead.", Color.Red);*/
                maxPlayersElement = NetConfig.MaxPlayers;
            }

@@ -540,5 +540,18 @@ namespace Barotrauma.Networking

            return element;
        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is ServerInfo other ? Equals(other) : base.Equals(obj);
+        }
+
+        public bool Equals(ServerInfo other)
+        {
+            return
+                other.OwnerID == OwnerID &&
+                (other.LobbyID == LobbyID || other.LobbyID == 0 || LobbyID == 0) &&
+                ((OwnerID == 0) ? (other.IP == IP && other.Port == Port) : true);
+        }
    }
 }