diff --git a/Server/Program.cs b/Server/Program.cs index aae6967..bc698c2 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -16,6 +16,9 @@ DiscordBot bot = new DiscordBot(); bot.Run(); server.ClientJoined += (c, _) => { + if (Settings.Instance.BanList.Enabled && (Settings.Instance.BanList.Players.Contains(c.Id) || Settings.Instance.BanList.IpAddresses.Contains( + ((IPEndPoint)c.Socket!.RemoteEndPoint!).Address.ToString()))) + throw new Exception($"Banned player attempted join: {c.Name}"); c.Metadata["shineSync"] = new ConcurrentBag(); c.Metadata["loadedSave"] = false; c.Metadata["scenario"] = (byte?)0; diff --git a/Server/Settings.cs b/Server/Settings.cs index 2657495..be6948e 100644 --- a/Server/Settings.cs +++ b/Server/Settings.cs @@ -56,11 +56,6 @@ public class Settings { public bool MergeEnabled { get; set; } = false; } - public class HiddenPlayers { - public bool Enabled { get; set; } = false; - public List Players { get; set; } = new List(); - } - public class BannedPlayers { public bool Enabled { get; set; } = false; public List Players { get; set; } = new List();