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

Rename RememberedPosManager, also remove some deprecation messages.

Browse source
This commit is contained in:
MarioE 2012-08-20 10:53:02 -04:00
parent 5b032f277d
commit 2e2539a4d1
3 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

38
TShockAPI/Commands.cs
View file

@ -339,12 +339,13 @@ namespace TShockAPI
{ {
if (args.Player.LoginAttempts > TShock.Config.MaximumLoginAttempts && (TShock.Config.MaximumLoginAttempts != -1)) if (args.Player.LoginAttempts > TShock.Config.MaximumLoginAttempts && (TShock.Config.MaximumLoginAttempts != -1))
{ {
Log.Warn(args.Player.IP + "(" + args.Player.Name + ") had " + TShock.Config.MaximumLoginAttempts + Log.Warn(String.Format("{0} ({1}) had {2} or more invalid login attempts and was kicked automatically.",
" 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."); 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 = ""; string encrPass = "";
if (args.Parameters.Count == 1) if (args.Parameters.Count == 1)
@ -356,15 +357,15 @@ namespace TShockAPI
{ {
user = TShock.Users.GetUserByName(args.Parameters[0]); user = TShock.Users.GetUserByName(args.Parameters[0]);
encrPass = TShock.Utils.HashPassword(args.Parameters[1]); encrPass = TShock.Utils.HashPassword(args.Parameters[1]);
if (String.IsNullOrEmpty(args.Parameters[0])) if (String.IsNullOrEmpty(args.Parameters[0]))
{ {
args.Player.SendErrorMessage("Error while logging in."); args.Player.SendErrorMessage("Bad login attempt.");
return; return;
} }
} }
else else
{ {
args.Player.SendErrorMessage("Syntax: /login [password]"); args.Player.SendErrorMessage(String.Format("Syntax: /login{0} <password>", TShock.Config.AllowLoginAnyUsername ? " " : " [username]"));
args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it."); args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it.");
return; return;
} }
@ -414,16 +415,17 @@ namespace TShockAPI
args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully."); args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully.");
Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + user.Name + "."); Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + user.Name + ".");
if ((args.Player.LoginHarassed) && (TShock.Config.RememberLeavePos)){ if ((args.Player.LoginHarassed) && (TShock.Config.RememberLeavePos))
if (TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP) != Vector2.Zero)
{ {
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 else
{ {
args.Player.SendErrorMessage("Incorrect password."); args.Player.SendErrorMessage("Incorrect password.");
@ -1226,13 +1228,13 @@ namespace TShockAPI
private static void Fullmoon(CommandArgs args) private static void Fullmoon(CommandArgs args)
{ {
TSPlayer.Server.SetFullMoon(true); 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) private static void Bloodmoon(CommandArgs args)
{ {
TSPlayer.Server.SetBloodMoon(true); 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) private static void Invade(CommandArgs args)

4
TShockAPI/DB/RememberPosManager.cs → TShockAPI/DB/RememberedPosManager.cs
View file

@ -22,11 +22,11 @@ using Terraria;
namespace TShockAPI.DB namespace TShockAPI.DB
{ {
public class RemeberedPosManager public class RememberedPosManager
{ {
public IDbConnection database; public IDbConnection database;
public RemeberedPosManager(IDbConnection db) public RememberedPosManager(IDbConnection db)
{ {
database = db; database = db;

20
TShockAPI/TShock.cs
View file

@ -55,7 +55,7 @@ namespace TShockAPI
public static GroupManager Groups; public static GroupManager Groups;
public static UserManager Users; public static UserManager Users;
public static ItemManager Itembans; public static ItemManager Itembans;
public static RemeberedPosManager RememberedPos; public static RememberedPosManager RememberedPos;
public static InventoryManager InventoryDB; public static InventoryManager InventoryDB;
public static ConfigFile Config { get; set; } public static ConfigFile Config { get; set; }
public static IDbConnection DB; public static IDbConnection DB;
@ -190,7 +190,7 @@ namespace TShockAPI
Users = new UserManager(DB); Users = new UserManager(DB);
Groups = new GroupManager(DB); Groups = new GroupManager(DB);
Itembans = new ItemManager(DB); Itembans = new ItemManager(DB);
RememberedPos = new RemeberedPosManager(DB); RememberedPos = new RememberedPosManager(DB);
InventoryDB = new InventoryManager(DB); InventoryDB = new InventoryManager(DB);
RestApi = new SecureRest(Netplay.serverListenIP, Config.RestApiPort); RestApi = new SecureRest(Netplay.serverListenIP, Config.RestApiPort);
RestApi.Verify += RestApi_Verify; RestApi.Verify += RestApi_Verify;
@ -906,11 +906,11 @@ namespace TShockAPI
if (player != null && player.Active) if (player != null && player.Active)
{ {
count++; 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)); 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") else if (text == "autosave")
{ {
@ -1216,22 +1216,22 @@ namespace TShockAPI
switch (random) switch (random)
{ {
case 0: 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; break;
case 1: case 1:
Utils.Broadcast(string.Format("Fatality! {0} goblins killed!", KillCount)); Utils.Broadcast(string.Format("Fatality! {0} goblins killed!", KillCount), Color.Green);
break; break;
case 2: 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; break;
case 3: 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; break;
case 4: 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; break;
case 5: 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; break;
} }
} }