diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 5c612da0..5eb0eed9 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -201,13 +201,16 @@ namespace TShockAPI
commands.Add(new Command("protectspawn", "editspawn", ProtectSpawn));
commands.Add(new Command("help", "", Help));
commands.Add(new Command("playing", "", Playing));
+ commands.Add(new Command("online", "", Playing));
+ commands.Add(new Command("who", "", Playing));
commands.Add(new Command("auth", "", AuthToken));
commands.Add(new Command("me", "", ThirdPerson));
commands.Add(new Command("p", "", PartyChat));
- commands.Add(new Command("butcher", "cheat", Butcher));
if (ConfigurationManager.distributationAgent != "terraria-online")
{
commands.Add(new Command("kill", "kill", Kill));
+ commands.Add(new Command("butcher", "cheat", Butcher));
+ commands.Add(new Command("i", "cheat", Item));
commands.Add(new Command("item", "cheat", Item));
commands.Add(new Command("give", "cheat", Give));
commands.Add(new Command("heal", "cheat", Heal));
@@ -269,8 +272,9 @@ namespace TShockAPI
ConfigurationManager.spawnProtectRadius, ConfigurationManager.defaultMaxSpawns,
ConfigurationManager.defaultSpawnRate);
Tools.SendMessage(ply, lineThree, Color.Yellow);
- string lineFour = string.Format("MaxSlots : {0}, RangeChecks : {1}",
- ConfigurationManager.maxSlots, ConfigurationManager.rangeChecks);
+ string lineFour = string.Format("MaxSlots : {0}, RangeChecks : {1}, SpamChecks : {2}",
+ ConfigurationManager.maxSlots, ConfigurationManager.rangeChecks,
+ ConfigurationManager.spamChecks);
Tools.SendMessage(ply, lineFour, Color.Yellow);
}
@@ -972,6 +976,8 @@ namespace TShockAPI
Tools.SendMessage(adminplr, "Invalid player!", Color.Red);
else if (player == -2)
Tools.SendMessage(adminplr, "More than one player matched!", Color.Red);
+ else if (player == adminplr)
+ Tools.SendMessage(adminplr, "Can't kill yourself!", Color.Red);
else
{
Tools.SendMessage(adminplr, string.Format("You just killed {0}!", Tools.FindPlayer(player)));
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 50c5e971..e002fc87 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -19,9 +19,9 @@ namespace TShockAPI
public static string saveDir = "./tshock/";
- public static Version VersionNum = new Version(2, 0, 0, 8);
+ public static Version VersionNum = new Version(2, 1, 0, 0);
- public static string VersionCodename = "RSaC (Red Sucks at Coding)";
+ public static string VersionCodename = "Versioning fails";
private static bool[] BlacklistTiles;
@@ -290,12 +290,6 @@ namespace TShockAPI
}
bool HandleTile(MemoryStream data, GetDataEventArgs e)
{
- if (Main.player[e.Msg.whoAmI].dead)
- {
- Tools.ForceKick(e.Msg.whoAmI, "Manipulating tiles when dead");
- return true;
- }
-
byte type = data.ReadInt8();
int x = data.ReadInt32();
int y = data.ReadInt32();
@@ -443,12 +437,6 @@ namespace TShockAPI
bool HandleLiquidSet(MemoryStream data, GetDataEventArgs e)
{
- if (Main.player[e.Msg.whoAmI].dead)
- {
- Tools.ForceKick(e.Msg.whoAmI, "Manipulating liquids when dead");
- return true;
- }
-
int x = data.ReadInt32();
int y = data.ReadInt32();
byte liquid = data.ReadInt8();
diff --git a/Update/Update.csproj b/Update/Update.csproj
index cdb0055d..2b5dda25 100644
--- a/Update/Update.csproj
+++ b/Update/Update.csproj
@@ -60,7 +60,7 @@
-
+