themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2011-12-22 04:00:24 -07:00
commit 1f08ee5281
4 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Commands.cs
View file

@ -215,7 +215,10 @@ namespace TShockAPI
Command cmd = ChatCommands.FirstOrDefault(c => c.HasAlias(cmdName));
if (cmd == null)
return false;
{
player.SendMessage("Invalid Command Entered. Type /help for a list of valid Commands.", Color.Red);
return true;
}
if (!cmd.CanRun(player))
{

44
TShockAPI/ConfigFile.cs
View file

@ -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;

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -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")]

2
TShockAPI/TShock.cs
View file

@ -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)