From a35dfcc1db8b8efe41c3e3902deb29ad63846c15 Mon Sep 17 00:00:00 2001 From: Graham Cantin Date: Thu, 22 Dec 2011 01:27:36 -0800 Subject: [PATCH] Fixes up Deathmax's Commit:b4971834238387d1cca96eea01f48fca51b0ba35 Adds some more/saner config descriptions while I'm at it. Bumped version tick to 1222. --- TShockAPI/ConfigFile.cs | 44 +++++++++++++++------------- TShockAPI/Properties/AssemblyInfo.cs | 4 +-- TShockAPI/TShock.cs | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index 4ec36764..aaf1d9a0 100644 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -94,28 +94,36 @@ namespace TShockAPI [Description("Valid types are \"sqlite\" and \"mysql\"")] public string StorageType = "sqlite"; - [Description("")] + [Description("The MySQL Hostname and port to direct connections to")] public string MySqlHost = "localhost:3306"; - [Description("")] + [Description("Database name to connect to")] public string MySqlDbName = ""; - [Description("")] + [Description("Database username to connect with")] public string MySqlUsername = ""; - [Description("")] + [Description("Database password to connect with")] public string MySqlPassword = ""; - [Description("")] - public string MediumcoreBanReason = "Death results in a ban"; - [Description("")] - public string MediumcoreKickReason = "Death results in a kick"; - [Description("")] - public bool EnableDNSHostResolution; - [Description("")] - public bool EnableBanOnUsernames; - [Description("")] - public bool EnableAntiLag = true; + [Description("Bans a Mediumcore player on death.")] + public string MediumcoreBanReason = "Death results in a ban"; + [Description("Kicks a Mediumcore player on death.")] + public string MediumcoreKickReason = "Death results in a kick"; + + [Description("Enables DNS resolution of incoming connections with GetGroupForIPExpensive.")] + public bool EnableDNSHostResolution; + + [Description("Enables kicking of banned users by matching their IP Address")] + public bool EnableIPBans = true; + + [Description("Enables kicking of banned users by matching their Character Name")] + public bool EnableBanOnUsernames; + + [Description("Drops excessive sync packets")] + public bool EnableAntiLag = true; + + [Description("Selects the default group name to place new registrants under")] public string DefaultRegistrationGroupName = "default"; - [Description("")] + [Description("Force-Disable printing logs to players with the log permission")] public bool DisableSpewLogs = true; [Description("Valid types are \"sha512\", \"sha256\", \"md5\", append with \"-xp\" for the xp supported algorithms")] @@ -160,12 +168,6 @@ namespace TShockAPI [Description("Kicks users using a proxy as identified with the GeoIP database")] public bool KickProxyUsers = true; - [Description("Kicks banned users by their name")] - public bool EnableNameBans = false; - - [Description("Kicks banned users by their IP")] - public bool EnableIPBans = true; - [Description("Disables hardmode, can't never be activated. Overrides /starthardmode")] public bool DisableHardmode = false; diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index 214e8c8d..1a3b5c52 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.4.1.1221")] -[assembly: AssemblyFileVersion("3.4.1.1221")] +[assembly: AssemblyVersion("3.4.1.1222")] +[assembly: AssemblyFileVersion("3.4.1.1222")] diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index ff7a6eda..860e4f88 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -526,7 +526,7 @@ namespace TShockAPI Ban ban = null; if (ipban != null && Config.EnableIPBans) ban = ipban; - else if (nameban != null && Config.EnableIPBans) + else if (nameban != null && Config.EnableBanOnUsernames) ban = nameban; if (ban != null)