From e539080625c86e43ff65c20cf91b4801859278f9 Mon Sep 17 00:00:00 2001
From: Deathmax <death@deathmax.tk>
Date: Fri, 2 Dec 2011 15:12:27 +0800
Subject: [PATCH] Fixy fix -/item now works

---
 TShockAPI/GetDataHandlers.cs         | 19 +++----------------
 TShockAPI/Properties/AssemblyInfo.cs |  4 ++--
 TShockAPI/TSPlayer.cs                |  4 ++--
 TShockAPI/Utils.cs                   |  8 ++++----
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index bd8c4e1a..fcb59bb7 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -145,21 +145,8 @@ namespace TShockAPI
             int plr = args.Data.ReadInt8();
             int slot = args.Data.ReadInt8();
             int stack = args.Data.ReadInt8();
-            int namelength = (int)(args.Data.Length - args.Data.Position - 1);
-
-            if (namelength > 0)
-            {
-                string itemname = Encoding.ASCII.GetString(args.Data.ReadBytes(namelength));
-
-                if (!args.Player.Group.HasPermission(Permissions.usebanneditem) && TShock.Itembans.ItemIsBanned(itemname))
-                    args.Player.Disconnect("Using banned item: " + itemname + ", remove it and rejoin");
-                if (itemname == "KANNIBALE BLADE"
-                    || itemname == "Super Gel")
-                    return TShock.Utils.HandleCheater(args.Player, string.Format(TShock.Config.GriefClientReason, "KANNIBALE"));
-                if (TShock.Utils.GetItemByName(itemname).Count == 0 && !args.Player.Group.HasPermission(Permissions.ignorecheatdetection)
-                    && TShock.Config.KickCustomItems)
-                    args.Player.Disconnect("Using custom item: " + itemname + ", remove it and region");
-            }
+            short prefix = (short) args.Data.ReadInt8();
+            int type = (int) args.Data.ReadInt16();
 
             return false;
         }
@@ -499,7 +486,7 @@ namespace TShockAPI
             }
 
 
-            if (type == 29 || type == 28 || type == 37)
+            if (type == 29 || type == 28 || type == 37) //need more explosives from 1.1
             {
                 Log.Debug(string.Format("Explosive(PlyXY:{0}_{1}, Type:{2})", args.Player.TileX, args.Player.TileY, type));
                 if (TShock.Config.DisableExplosives && (!args.Player.Group.HasPermission(Permissions.useexplosives) || !args.Player.Group.HasPermission(Permissions.ignoregriefdetection)))
diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs
index 3a751908..736a837d 100644
--- a/TShockAPI/Properties/AssemblyInfo.cs
+++ b/TShockAPI/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 
 
-[assembly: AssemblyVersion("3.3.4.1201")]
-[assembly: AssemblyFileVersion("3.3.4.1201")]
+[assembly: AssemblyVersion("3.3.4.1202")]
+[assembly: AssemblyFileVersion("3.3.4.1202")]
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index f86e1a14..ddf32122 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -131,9 +131,9 @@ namespace TShockAPI
                 bool flag = false;
                 if (RealPlayer)
                 {
-                    for (int i = 0; i < 40; i++)
+                    for (int i = 0; i < 45; i++)
                     {
-                        if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active)
+                        if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active || TPlayer.inventory[i].name == "")
                         {
                             flag = true;
                             break;
diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index da33f70e..311deee2 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -232,7 +232,7 @@ namespace TShockAPI
         public Item GetItemById(int id)
         {
             Item item = new Item();
-            item.SetDefaults(id);
+            item.netDefaults(id);
             return item;
         }
 
@@ -253,7 +253,7 @@ namespace TShockAPI
                 try
                 {
                     Item item = new Item();
-                    item.SetDefaults(i);
+                    item.netDefaults(i);
                     if (item.name.ToLower() == name.ToLower())
                         return new List<Item> { item };
                     if (item.name.ToLower().StartsWith(name.ToLower()))
@@ -277,7 +277,7 @@ namespace TShockAPI
         public NPC GetNPCById(int id)
         {
             NPC npc = new NPC();
-            npc.SetDefaults(id);
+            npc.netDefaults(id);
             return npc;
         }
 
@@ -296,7 +296,7 @@ namespace TShockAPI
             for (int i = 1; i < Main.maxNPCTypes; i++)
             {
                 NPC npc = new NPC();
-                npc.SetDefaults(i);
+                npc.netDefaults(i);
                 if (npc.name.ToLower() == name.ToLower())
                     return new List<NPC> { npc };
                 if (npc.name.ToLower().StartsWith(name.ToLower()))