From c690a2d2fcac18d341b79db6eba52fd4fd13d9cd Mon Sep 17 00:00:00 2001
From: Shank <nicatron21@gmail.com>
Date: Sat, 11 Jun 2011 00:43:14 -0600
Subject: [PATCH 1/3] Added command aliases: - /i - /who, /online Closes #63
 Closes #62

Kill isn't possible.
Closes #66
---
 TShockAPI/Commands.cs | 3 +++
 TShockAPI/TShock.cs   | 4 ++--
 Update/Update.csproj  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 5c612da0..740d5e44 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -205,6 +205,9 @@ namespace TShockAPI
             commands.Add(new Command("me", "", ThirdPerson));
             commands.Add(new Command("p", "", PartyChat));
             commands.Add(new Command("butcher", "cheat", Butcher));
+            commands.Add(new Command("i", "cheat", Item));
+            commands.Add(new Command("online", "", Playing));
+            commands.Add(new Command("who", "", Playing));
             if (ConfigurationManager.distributationAgent != "terraria-online")
             {
                 commands.Add(new Command("kill", "kill", Kill));
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 50c5e971..f27a6d56 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;
 
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 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\TShockAPI.dll" />
+    <Folder Include="Resources\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 82470d1cf11be60472ef4179a873b47ae99dd24e Mon Sep 17 00:00:00 2001
From: ricky <rjhazelwood@gmail.com>
Date: Sat, 11 Jun 2011 20:37:29 +1000
Subject: [PATCH 2/3] Added message when trying to kill self (1.0.4 doesnt let
 you kill self using kill me packet)

Enable all the cheat comands only if distributationAgent != "terraria-online"
Added spamChecks to output of debug-config
---
 TShockAPI/Commands.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 740d5e44..5eb0eed9 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -201,16 +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));
-            commands.Add(new Command("i", "cheat", Item));
-            commands.Add(new Command("online", "", Playing));
-            commands.Add(new Command("who", "", Playing));
             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));
@@ -272,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);
         }
 
@@ -975,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)));

From 11f6ce877930fa95e0f2df4d440634d2c2101d9f Mon Sep 17 00:00:00 2001
From: high <pooop828@hotmail.com>
Date: Sat, 11 Jun 2011 20:58:56 -0400
Subject: [PATCH 3/3] Removed dead checks.

---
 TShockAPI/TShock.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index f27a6d56..e002fc87 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -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();