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

This commit is contained in:
darkunderdog 2012-01-04 20:11:34 -06:00
commit ddf7531d66
11 changed files with 596 additions and 401 deletions

View file

@ -932,7 +932,7 @@ namespace TShockAPI
Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + args.Player.Name);
return true;
}
TShock.Utils.ForceKick(args.Player, "Incorrect User Account Password");
TShock.Utils.ForceKick(args.Player, "Invalid user account password.", true);
return true;
}
if (!string.IsNullOrEmpty(TShock.Config.ServerPassword))