Merge branch 'master' of github.com:TShock/TShock

README.md

@@ -14,4 +14,12 @@ We communicate on the ShankShock Temspeak server whilst programming.
 
 __IP__: ts3.shankshock.com
 
-__Port__: 9987
+__Port__: 9987
+
+### IRC
+
+We love IRC.
+
+__IP__: irc.shankshock.com
+
+__Channel__: #terraria

TShockAPI/TShock.cs

@@ -18,9 +18,9 @@ namespace TShockAPI
 
         public static string saveDir = "./tshock/";
 
-        public static Version VersionNum = new Version(1, 9, 0, 1);
+        public static Version VersionNum = new Version(2, 0, 0, 1);
 
-        public static string VersionCodename = "SPACEEE";
+        public static string VersionCodename = "UnrealIRCd ftw (irc.shankshock.com #terraria)";
 
         public static bool shownVersion;
 
@@ -336,48 +336,6 @@ namespace TShockAPI
                     return Tools.HandleGriefer(e.Msg.whoAmI, "Update Player abuse");
                 }
             }
-            else if (e.MsgID == 0x10)
-            {
-                using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
-                {
-                    byte ply = br.ReadByte();
-                    short life = br.ReadInt16();
-                    short maxLife = br.ReadInt16();
-
-                    if (maxLife > Main.player[ply].statLifeMax + 20 || life > maxLife)
-                    {
-                        if (players[ply].syncHP)
-                        {
-                            return Tools.HandleCheater(ply, "Abnormal life increase");
-                        }
-                        else
-                        {
-                            players[ply].syncHP = true;
-                        }
-                    }
-                }
-            }
-            else if (e.MsgID == 0x2a)
-            {
-                using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
-                {
-                    byte ply = br.ReadByte();
-                    short mana = br.ReadInt16();
-                    short maxmana = br.ReadInt16();
-
-                    if (maxmana > Main.player[ply].statManaMax + 20 || mana > maxmana)
-                    {
-                        if (players[ply].syncMP)
-                        {
-                            return Tools.HandleCheater(ply, "Abnormal mana increase");
-                        }
-                        else
-                        {
-                            players[ply].syncMP = true;
-                        }
-                    }
-                }
-            }
             else if (e.MsgID == 0x1B) // New Projectile
             {
                 using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
@@ -392,7 +350,7 @@ namespace TShockAPI
                     byte owner = br.ReadByte();
                     byte type = br.ReadByte();
 
-                    if (type == 29 || type == 28 || type == 30)
+                    if (type == 29 || type == 28 || type == 37)
                     {
                         return Tools.HandleExplosivesUser(e.Msg.whoAmI, "Throwing an explosive device.");
                     }
@@ -441,8 +399,7 @@ namespace TShockAPI
 
                     if (Main.player[e.Msg.whoAmI].selectedItem == 0x72) //Dirt Rod
                     {
-                        Tools.ForceKick(e.Msg.whoAmI, "Using dirt rod");
+                        return Tools.Kick(e.Msg.whoAmI, "Using dirt rod");
-                        return true;
                     }
 
                     int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16);

TShockAPI/Tools.cs

@@ -254,7 +254,7 @@ namespace TShockAPI
                 string ip = GetPlayerIP(plr);
                 string playerName = Main.player[plr].name;
                 TShock.Bans.AddBan(ip, playerName, reason);
-                if (!Main.player[plr].active || Netplay.serverSock[plr].kill)
+                if (Main.player[plr].active || !Netplay.serverSock[plr].kill)
                     NetMessage.SendData(0x2, plr, -1, "Banned: " + reason, 0x0, 0f, 0f, 0f);
                 Log.Info("Banned " + playerName + " for : " + reason);
                 if (adminUserName.Length == 0)

Update/Program.cs

@@ -19,7 +19,6 @@ namespace Update
                 StreamReader sr = new StreamReader("pn");
                 procname = sr.ReadToEnd();
                 sr.Close();
-
                 string[] datat = procname.Split(' ');
                 procname = datat[0];
                 procargs = "";

Update/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     Runtime Version:4.0.30319.225
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Update/Resources.resx

@@ -119,6 +119,6 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TShockAPI" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\TShockAPI\bin\Release\TShockAPI.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>Resources\TShockAPI.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>

Update/Update.csproj

@@ -59,8 +59,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <None Include="Resources\TShockAPI.dll" />
+    <Content Include="Resources\TShockAPI.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

release-docs/changes.txt

@@ -1,5 +1,9 @@
 For the full list of changes, please take a look at GitHub:
 https://github.com/TShock/TShock/commits/master
+From now on, all release notes aren't put here. It's too much to track, but new features will be tossed here.
+
+Changes in API release 2.0.0.0:
+ - Added update checker.
 
 Changes in API release 1.8.0.0:
  - Added permissions system for managing different levels of admins