From 2e2539a4d1459ff9c5a52a074ddb4b9267d09e1e Mon Sep 17 00:00:00 2001 From: MarioE Date: Mon, 20 Aug 2012 10:53:02 -0400 Subject: [PATCH] Rename RememberedPosManager, also remove some deprecation messages. --- TShockAPI/Commands.cs | 38 ++++++++++--------- ...rPosManager.cs => RememberedPosManager.cs} | 4 +- TShockAPI/TShock.cs | 20 +++++----- 3 files changed, 32 insertions(+), 30 deletions(-) rename TShockAPI/DB/{RememberPosManager.cs => RememberedPosManager.cs} (97%) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 32958221..fe734174 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -339,12 +339,13 @@ namespace TShockAPI { if (args.Player.LoginAttempts > TShock.Config.MaximumLoginAttempts && (TShock.Config.MaximumLoginAttempts != -1)) { - Log.Warn(args.Player.IP + "(" + args.Player.Name + ") had " + TShock.Config.MaximumLoginAttempts + - " or more invalid login attempts and was kicked automatically."); + Log.Warn(String.Format("{0} ({1}) had {2} or more invalid login attempts and was kicked automatically.", + args.Player.IP, args.Player.Name, TShock.Config.MaximumLoginAttempts)); TShock.Utils.Kick(args.Player, "Too many invalid login attempts."); + return; } - var user = TShock.Users.GetUserByName(args.Player.Name); + User user = TShock.Users.GetUserByName(args.Player.Name); string encrPass = ""; if (args.Parameters.Count == 1) @@ -356,15 +357,15 @@ namespace TShockAPI { user = TShock.Users.GetUserByName(args.Parameters[0]); encrPass = TShock.Utils.HashPassword(args.Parameters[1]); - if (String.IsNullOrEmpty(args.Parameters[0])) - { - args.Player.SendErrorMessage("Error while logging in."); - return; - } + if (String.IsNullOrEmpty(args.Parameters[0])) + { + args.Player.SendErrorMessage("Bad login attempt."); + return; + } } else { - args.Player.SendErrorMessage("Syntax: /login [password]"); + args.Player.SendErrorMessage(String.Format("Syntax: /login{0} ", TShock.Config.AllowLoginAnyUsername ? " " : " [username]")); args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it."); return; } @@ -414,16 +415,17 @@ namespace TShockAPI args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully."); Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + user.Name + "."); - if ((args.Player.LoginHarassed) && (TShock.Config.RememberLeavePos)){ - if (TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP) != Vector2.Zero) + if ((args.Player.LoginHarassed) && (TShock.Config.RememberLeavePos)) { - Vector2 pos = TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP); + if (TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP) != Vector2.Zero) + { + Vector2 pos = TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP); + args.Player.Teleport((int)pos.X, (int)pos.Y + 3); + } + args.Player.LoginHarassed = false; - args.Player.Teleport((int) pos.X, (int) pos.Y + 3); } - args.Player.LoginHarassed = false; - - }} + } else { args.Player.SendErrorMessage("Incorrect password."); @@ -1226,13 +1228,13 @@ namespace TShockAPI private static void Fullmoon(CommandArgs args) { TSPlayer.Server.SetFullMoon(true); - TShock.Utils.Broadcast(string.Format("{0} turned on the full moon.", args.Player.Name)); + TShock.Utils.Broadcast(string.Format("{0} turned on the full moon.", args.Player.Name), Color.Green); } private static void Bloodmoon(CommandArgs args) { TSPlayer.Server.SetBloodMoon(true); - TShock.Utils.Broadcast(string.Format("{0} turned on the blood moon.", args.Player.Name)); + TShock.Utils.Broadcast(string.Format("{0} turned on the blood moon.", args.Player.Name), Color.Green); } private static void Invade(CommandArgs args) diff --git a/TShockAPI/DB/RememberPosManager.cs b/TShockAPI/DB/RememberedPosManager.cs similarity index 97% rename from TShockAPI/DB/RememberPosManager.cs rename to TShockAPI/DB/RememberedPosManager.cs index ee06db63..88d57215 100644 --- a/TShockAPI/DB/RememberPosManager.cs +++ b/TShockAPI/DB/RememberedPosManager.cs @@ -22,11 +22,11 @@ using Terraria; namespace TShockAPI.DB { - public class RemeberedPosManager + public class RememberedPosManager { public IDbConnection database; - public RemeberedPosManager(IDbConnection db) + public RememberedPosManager(IDbConnection db) { database = db; diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 6a05293b..4df96695 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -55,7 +55,7 @@ namespace TShockAPI public static GroupManager Groups; public static UserManager Users; public static ItemManager Itembans; - public static RemeberedPosManager RememberedPos; + public static RememberedPosManager RememberedPos; public static InventoryManager InventoryDB; public static ConfigFile Config { get; set; } public static IDbConnection DB; @@ -190,7 +190,7 @@ namespace TShockAPI Users = new UserManager(DB); Groups = new GroupManager(DB); Itembans = new ItemManager(DB); - RememberedPos = new RemeberedPosManager(DB); + RememberedPos = new RememberedPosManager(DB); InventoryDB = new InventoryManager(DB); RestApi = new SecureRest(Netplay.serverListenIP, Config.RestApiPort); RestApi.Verify += RestApi_Verify; @@ -906,11 +906,11 @@ namespace TShockAPI if (player != null && player.Active) { count++; - TSPlayer.Server.SendMessage(string.Format("{0} ({1}) [{2}] <{3}>", player.Name, player.IP, + TSPlayer.Server.SendInfoMessage(string.Format("{0} ({1}) [{2}] <{3}>", player.Name, player.IP, player.Group.Name, player.UserAccountName)); } } - TSPlayer.Server.SendMessage(string.Format("{0} players connected.", count)); + TSPlayer.Server.SendInfoMessage(string.Format("{0} players connected.", count)); } else if (text == "autosave") { @@ -1216,22 +1216,22 @@ namespace TShockAPI switch (random) { case 0: - Utils.Broadcast(string.Format("You call that a lot? {0} goblins killed!", KillCount)); + Utils.Broadcast(string.Format("You call that a lot? {0} goblins killed!", KillCount), Color.Green); break; case 1: - Utils.Broadcast(string.Format("Fatality! {0} goblins killed!", KillCount)); + Utils.Broadcast(string.Format("Fatality! {0} goblins killed!", KillCount), Color.Green); break; case 2: - Utils.Broadcast(string.Format("Number of 'noobs' killed to date: {0}", KillCount)); + Utils.Broadcast(string.Format("Number of 'noobs' killed to date: {0}", KillCount), Color.Green); break; case 3: - Utils.Broadcast(string.Format("Duke Nukem would be proud. {0} goblins killed.", KillCount)); + Utils.Broadcast(string.Format("Duke Nukem would be proud. {0} goblins killed.", KillCount), Color.Green); break; case 4: - Utils.Broadcast(string.Format("You call that a lot? {0} goblins killed!", KillCount)); + Utils.Broadcast(string.Format("You call that a lot? {0} goblins killed!", KillCount), Color.Green); break; case 5: - Utils.Broadcast(string.Format("{0} copies of Call of Duty smashed.", KillCount)); + Utils.Broadcast(string.Format("{0} copies of Call of Duty smashed.", KillCount), Color.Green); break; } }