(f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-06-12 16:45:24 +03:00
parent dce98349ea
commit adab8589da
14 changed files with 119 additions and 78 deletions
@@ -35,6 +35,7 @@ namespace Barotrauma.Networking
public bool CompareTo(string ipCompare)
{
if (string.IsNullOrEmpty(IP)) { return false; }
if (!IsRangeBan)
{
return ipCompare == IP;
@@ -49,6 +50,7 @@ namespace Barotrauma.Networking
public bool CompareTo(IPAddress ipCompare)
{
if (string.IsNullOrEmpty(IP)) { return false; }
if (ipCompare.IsIPv4MappedToIPv6 && CompareTo(ipCompare.MapToIPv4().ToString()))
{
return true;