Print Packet Name

src/main/java/kamkeel/npcs/network/PacketUtil.java

@@ -23,14 +23,14 @@ import java.util.Set;
 
 public class PacketUtil {
 
-    public static boolean verifyItemPacket(EnumItemPacketType type, EntityPlayer player) {
+    public static boolean verifyItemPacket(String name, EnumItemPacketType type, EntityPlayer player) {
         if (player == null)
             return false;
 
         ItemStack item = player.inventory.getCurrentItem();
         if (item == null) {
-            LogWriter.error(String.format("%s attempted to utilize a %s Packet without an item, they could be a hacker",
-                player.getCommandSenderName(), type));
+            LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without an item, they could be a hacker",
+                player.getCommandSenderName(), type, name));
             return false;
         }
 
@@ -38,42 +38,42 @@ public class PacketUtil {
             case WAND:
                 if (item.getItem() != CustomItems.wand) {
                     LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Wand, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case MOUNTER:
                 if (item.getItem() != CustomItems.mount) {
                     LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Mounter, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case CLONER:
                 if (item.getItem() != CustomItems.cloner) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Cloner, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Cloner, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case TELEPORTER:
                 if (item.getItem() != CustomItems.teleporter) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Teleporter, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Teleporter, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case SCRIPTER:
                 if (item.getItem() != CustomItems.scripter) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Scripter, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Scripter, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case PATHER:
                 if (item.getItem() != CustomItems.moving) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Pather, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Pather, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
@@ -81,29 +81,29 @@ public class PacketUtil {
                 if (item.getItem() == Item.getItemFromBlock(CustomItems.waypoint)
                     || item.getItem() == Item.getItemFromBlock(CustomItems.border)
                     || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock)) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a valid Block, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a valid Block, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case BRUSH:
                 if (item.getItem() != CustomItems.tool || item.getItemDamage() != 1) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Pather, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Pather, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case HAMMER:
                 if (item.getItem() != CustomItems.tool || item.getItemDamage() != 0) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Hammer, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Hammer, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
             case MAGIC_BOOK:
                 if (item.getItem() != CustomItems.tool || item.getItemDamage() != 2) {
-                    LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Magic Book, they could be a hacker",
-                        player.getCommandSenderName(), type));
+                    LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Magic Book, they could be a hacker",
+                        player.getCommandSenderName(), type, name));
                     return false;
                 }
                 break;
@@ -116,14 +116,14 @@ public class PacketUtil {
      * It returns true if any one of the provided types is valid.
      * If none are valid, a merged error message is logged.
      */
-    public static boolean verifyItemPacket(EntityPlayer player, EnumItemPacketType... types) {
+    public static boolean verifyItemPacket(String name, EntityPlayer player, EnumItemPacketType... types) {
         if (player == null)
             return false;
 
         ItemStack item = player.inventory.getCurrentItem();
         if (item == null) {
-            LogWriter.error(String.format("%s attempted to utilize a Packet without an item. Expected one of: %s, they could be a hacker",
-                player.getCommandSenderName(), getExpectedItemNames(types)));
+            LogWriter.error(String.format("%s attempted to utilize a %s without an item. Expected one of: %s, they could be a hacker",
+                player.getCommandSenderName(), name, getExpectedItemNames(types)));
             return false;
         }
 
@@ -134,8 +134,8 @@ public class PacketUtil {
         }
 
         // None passed; log one merged error message listing all expected items.
-        LogWriter.error(String.format("%s attempted to utilize a Packet without a valid item. Expected one of: %s, they could be a hacker",
-            player.getCommandSenderName(), getExpectedItemNames(types)));
+        LogWriter.error(String.format("%s attempted to utilize a %s without a valid item. Expected one of: %s, they could be a hacker",
+            player.getCommandSenderName(), name, getExpectedItemNames(types)));
         return false;
     }
 

src/main/java/kamkeel/npcs/network/packets/player/item/GuiMagicBookPacket.java

@@ -53,7 +53,7 @@ public class GuiMagicBookPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.MAGIC_BOOK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.MAGIC_BOOK))
             return;
 
         int index = in.readInt();

src/main/java/kamkeel/npcs/network/packets/player/item/GuiPaintbrushPacket.java

@@ -9,7 +9,6 @@ import kamkeel.npcs.network.PacketHandler;
 import kamkeel.npcs.network.PacketUtil;
 import kamkeel.npcs.network.enums.EnumItemPacketType;
 import kamkeel.npcs.network.enums.EnumPlayerPacket;
-import kamkeel.npcs.network.enums.EnumRequestPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import noppes.npcs.NoppesUtilServer;
@@ -54,7 +53,7 @@ public class GuiPaintbrushPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.BRUSH))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.BRUSH))
             return;
 
         int index = in.readInt();

src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java

@@ -7,12 +7,9 @@ import kamkeel.npcs.network.*;
 import kamkeel.npcs.network.enums.EnumItemPacketType;
 import kamkeel.npcs.network.enums.EnumPlayerPacket;
 import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
-import kamkeel.npcs.network.packets.request.magic.MagicGetPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.NoppesUtilServer;
-import noppes.npcs.constants.EnumGuiType;
 import noppes.npcs.constants.EnumScrollData;
 import noppes.npcs.controllers.MagicController;
 import noppes.npcs.controllers.data.MagicCycle;
@@ -53,7 +50,7 @@ public class MagicCyclesPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.MAGIC_BOOK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.MAGIC_BOOK))
             return;
 
         int id = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/GuiRequestPacket.java

@@ -28,8 +28,7 @@ public final class GuiRequestPacket extends AbstractPacket {
         this.posZ = posZ;
     }
 
-    public GuiRequestPacket() {
-    }
+    public GuiRequestPacket() {}
 
     @Override
     public Enum getType() {
@@ -54,7 +53,7 @@ public final class GuiRequestPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER, EnumItemPacketType.BRUSH, EnumItemPacketType.MAGIC_BOOK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER, EnumItemPacketType.BRUSH, EnumItemPacketType.MAGIC_BOOK))
             return;
         int index = in.readInt();
         int x = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java

@@ -53,7 +53,7 @@ public final class MailOpenSetupPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         PlayerMail mail = new PlayerMail();

src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java

@@ -60,7 +60,7 @@ public final class MerchantUpdatePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int entityId = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java

@@ -61,7 +61,7 @@ public final class MountPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.MOUNTER, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.MOUNTER, player))
             return;
 
         MountPacket.Action requestedAction = MountPacket.Action.values()[in.readInt()];

src/main/java/kamkeel/npcs/network/packets/request/TileEntityGetPacket.java

@@ -57,7 +57,7 @@ public final class TileEntityGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         TileEntity tile = player.worldObj.getTileEntity(in.readInt(), in.readInt(), in.readInt());

src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java

@@ -50,7 +50,7 @@ public final class TileEntitySavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         NoppesUtilServer.saveTileEntity((EntityPlayerMP) player, ByteBufUtils.readNBT(in));

src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java

@@ -64,7 +64,7 @@ public final class TraderMarketSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         String market = ByteBufUtils.readString(in);

src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java

@@ -51,7 +51,7 @@ public final class AnimationGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int id = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java

@@ -58,7 +58,7 @@ public final class AnimationRemovePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int id = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java

@@ -59,7 +59,7 @@ public final class AnimationSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NBTTagCompound compound = ByteBufUtils.readNBT(in);

src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java

@@ -40,7 +40,7 @@ public final class AnimationsGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player);

src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java

@@ -49,7 +49,7 @@ public final class BankGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         int id = in.readInt();
 

src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java

@@ -56,7 +56,7 @@ public final class BankRemovePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int id = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java

@@ -57,7 +57,7 @@ public final class BankSavePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NBTTagCompound compound = ByteBufUtils.readNBT(in);

src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java

@@ -42,7 +42,7 @@ public final class BanksGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player);
     }

src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsPacket.java

@@ -45,7 +45,7 @@ public final class CloneAllTagsPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         NBTTagCompound compound = new NBTTagCompound();

src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsShortPacket.java

@@ -45,7 +45,7 @@ public final class CloneAllTagsShortPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         NBTTagCompound compound = new NBTTagCompound();

src/main/java/kamkeel/npcs/network/packets/request/clone/CloneListPacket.java

@@ -51,7 +51,7 @@ public final class CloneListPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.MOUNTER, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.MOUNTER, EnumItemPacketType.CLONER))
             return;
 
         NBTTagList list = new NBTTagList();

src/main/java/kamkeel/npcs/network/packets/request/clone/ClonePreSavePacket.java

@@ -59,7 +59,7 @@ public final class ClonePreSavePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         boolean bo = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(in), in.readInt()) != null;

src/main/java/kamkeel/npcs/network/packets/request/clone/CloneRemovePacket.java

@@ -61,7 +61,7 @@ public final class CloneRemovePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         int tab = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java

@@ -67,7 +67,7 @@ public final class CloneSavePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         PlayerData data = PlayerDataController.Instance.getPlayerData(player);

src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java

@@ -50,7 +50,7 @@ public final class CloneTagListPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         int tab = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java

@@ -94,7 +94,7 @@ public class MobSpawnerPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         Action requestedAction = Action.values()[in.readInt()];

src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java

@@ -100,7 +100,7 @@ public class SpawnMobPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
             return;
 
         Action requestedAction = Action.values()[in.readInt()];

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java

@@ -43,7 +43,7 @@ public final class DialogCategoriesGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll(), EnumScrollData.OPTIONAL);

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java

@@ -49,7 +49,7 @@ public final class DialogCategoryGetPacket extends AbstractPacket {
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP)) return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return;
         int id = in.readInt();
         DialogCategory category = DialogController.Instance.categories.get(id);
         if (category != null) {

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java

@@ -56,7 +56,7 @@ public final class DialogCategoryRemovePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         int id = in.readInt();
         DialogController.Instance.removeCategory(id);

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java

@@ -57,7 +57,7 @@ public final class DialogCategorySavePacket extends AbstractPacket {
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP)) return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return;
         NBTTagCompound compound = ByteBufUtils.readNBT(in);
         DialogCategory category = new DialogCategory();
         category.readNBT(compound);

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java

@@ -50,7 +50,7 @@ public final class DialogGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         Dialog dialog = DialogController.Instance.dialogs.get(in.readInt());

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java

@@ -41,7 +41,7 @@ public final class DialogNpcGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NoppesUtilServer.sendNpcDialogs(player);

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java

@@ -58,7 +58,7 @@ public final class DialogNpcRemovePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int idx = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java

@@ -63,7 +63,7 @@ public final class DialogNpcSetPacket extends AbstractPacket {
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP)) return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return;
         int s = in.readInt();
         int d = in.readInt();
         DialogOption option = NoppesUtilServer.setNpcDialog(s, d, player);

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java

@@ -58,7 +58,7 @@ public final class DialogRemovePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         int diagId = in.readInt();
         boolean sendGroup = in.readBoolean();

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java

@@ -64,7 +64,7 @@ public final class DialogSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int cat = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogsGetPacket.java

@@ -52,7 +52,7 @@ public final class DialogsGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         int catID = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/effects/EffectGetPacket.java

@@ -46,7 +46,7 @@ public final class EffectGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int effectID = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/effects/EffectRemovePacket.java

@@ -54,7 +54,7 @@ public class EffectRemovePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int effectID = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/effects/EffectSavePacket.java

@@ -57,7 +57,7 @@ public class EffectSavePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         String prevName = ByteBufUtils.readString(in);

src/main/java/kamkeel/npcs/network/packets/request/effects/EffectsGetPacket.java

@@ -47,7 +47,7 @@ public final class EffectsGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int effectID = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java

@@ -48,7 +48,7 @@ public final class FactionGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         NBTTagCompound compound = new NBTTagCompound();

src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java

@@ -63,7 +63,7 @@ public final class FactionRemovePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int id = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java

@@ -64,7 +64,7 @@ public final class FactionSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NBTTagCompound compound = ByteBufUtils.readNBT(in);

src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java

@@ -58,7 +58,7 @@ public final class FactionSetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int factionId = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/faction/FactionsGetPacket.java

@@ -42,7 +42,7 @@ public final class FactionsGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         NoppesUtilServer.sendFactionDataAll((EntityPlayerMP) player);

src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java

@@ -51,7 +51,7 @@ public final class DimensionTeleportPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.TELEPORTER))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.TELEPORTER))
             return;
 
         int dimension = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/item/ColorBrushPacket.java

@@ -56,7 +56,7 @@ public final class ColorBrushPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.BRUSH, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.BRUSH, player))
             return;
 
         int color = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/item/ColorSetPacket.java

@@ -65,7 +65,7 @@ public final class ColorSetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.BRUSH, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.BRUSH, player))
             return;
 
         int x = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/item/HammerPacket.java

@@ -61,7 +61,7 @@ public final class HammerPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.HAMMER, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.HAMMER, player))
             return;
 
         int x = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java

@@ -55,7 +55,7 @@ public final class JobGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         if (npc.jobInterface == null)

src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java

@@ -59,7 +59,7 @@ public final class JobSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NBTTagCompound original = npc.jobInterface.writeToNBT(new NBTTagCompound());

src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java

@@ -87,7 +87,7 @@ public final class JobSpawnerAddPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         if (npc.advanced.job != EnumJobType.Spawner)

src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java

@@ -61,7 +61,7 @@ public final class JobSpawnerRemovePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         if (npc.advanced.job != EnumJobType.Spawner)

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java

@@ -50,7 +50,7 @@ public final class LinkedGetAllPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         Action action = Action.values()[in.readInt()];

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java

@@ -62,7 +62,7 @@ public final class LinkedGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         Action action = Action.values()[in.readInt()];

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java

@@ -54,7 +54,7 @@ public final class LinkedItemBuildPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int id = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemRemovePacket.java

@@ -54,7 +54,7 @@ public final class LinkedItemRemovePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int linkedID = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemSavePacket.java

@@ -60,7 +60,7 @@ public final class LinkedItemSavePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         String prevName = ByteBufUtils.readString(in);

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java

@@ -59,7 +59,7 @@ public final class LinkedNPCAddPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         String received = ByteBufUtils.readString(in);

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java

@@ -58,7 +58,7 @@ public final class LinkedNPCRemovePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         String received = ByteBufUtils.readString(in);

src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java

@@ -59,7 +59,7 @@ public final class LinkedSetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         npc.linkedName = ByteBufUtils.readString(in);

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java

@@ -52,7 +52,7 @@ public final class MagicGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND))
             return;
 
         Action action = Action.values()[in.readInt()];

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java

@@ -44,7 +44,7 @@ public final class MagicNpcGetPacket extends AbstractPacket {
 
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND))
             return;
 
         NBTTagCompound compound = new NBTTagCompound();

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java

@@ -61,7 +61,7 @@ public final class MagicNpcSavePacket extends AbstractPacket {
 
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND))
             return;
 
         NBTTagCompound compound = ByteBufUtils.readNBT(in);

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java

@@ -47,7 +47,7 @@ public final class MainmenuAIGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.ais.writeToNBT(new NBTTagCompound()));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java

@@ -60,7 +60,7 @@ public final class MainmenuAISavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         npc.ais.readToNBT(ByteBufUtils.readNBT(in));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java

@@ -47,7 +47,7 @@ public final class MainmenuAdvancedGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.advanced.writeToNBT(new NBTTagCompound()));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java

@@ -61,7 +61,7 @@ public final class MainmenuAdvancedMarkDataPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         MarkData data = MarkData.get(npc);

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java

@@ -60,7 +60,7 @@ public final class MainmenuAdvancedSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         npc.advanced.readToNBT(ByteBufUtils.readNBT(in));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java

@@ -47,7 +47,7 @@ public final class MainmenuDisplayGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.display.writeToNBT(new NBTTagCompound()));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java

@@ -60,7 +60,7 @@ public final class MainmenuDisplaySavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         npc.display.readToNBT(ByteBufUtils.readNBT(in));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java

@@ -47,7 +47,7 @@ public final class MainmenuInvGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.inventory.writeEntityToNBT(new NBTTagCompound()));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java

@@ -60,7 +60,7 @@ public final class MainmenuInvSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         npc.inventory.readEntityFromNBT(ByteBufUtils.readNBT(in));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java

@@ -47,7 +47,7 @@ public final class MainmenuStatsGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.stats.writeToNBT(new NBTTagCompound()));

src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java

@@ -60,7 +60,7 @@ public final class MainmenuStatsSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         npc.stats.readToNBT(ByteBufUtils.readNBT(in));

src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java

@@ -42,7 +42,7 @@ public final class NaturalSpawnGetAllPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll(), EnumScrollData.OPTIONAL);
     }

src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java

@@ -51,7 +51,7 @@ public final class NaturalSpawnGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         int id = in.readInt();
         SpawnData spawn = SpawnController.Instance.getSpawnData(id);

src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java

@@ -55,7 +55,7 @@ public final class NaturalSpawnRemovePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         int id = in.readInt();
         SpawnController.Instance.removeSpawnData(id);

src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java

@@ -58,7 +58,7 @@ public final class NaturalSpawnSavePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         NBTTagCompound compound = ByteBufUtils.readNBT(in);
         SpawnData data = new SpawnData();

src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java

@@ -61,7 +61,7 @@ public final class ModelDataSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         if (npc instanceof EntityCustomNpc)

src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java

@@ -52,7 +52,7 @@ public final class NpcClosePacket extends AbstractPacket {
 
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         npc.reset();

src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java

@@ -52,7 +52,7 @@ public final class NpcDeletePacket extends AbstractPacket {
 
     @Override
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java

@@ -58,7 +58,7 @@ public final class RemoteDeletePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof net.minecraft.entity.player.EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         int id = in.readInt();
         Entity entity = player.worldObj.getEntityByID(id);

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java

@@ -41,7 +41,7 @@ public final class RemoteFreezeGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, CustomNpcs.FreezeNPCs ? "Unfreeze NPCs" : "Freeze NPCs");
     }

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java

@@ -47,7 +47,7 @@ public final class RemoteFreezePacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         CustomNpcs.FreezeNPCs = !CustomNpcs.FreezeNPCs;
         ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, CustomNpcs.FreezeNPCs ? "Unfreeze NPCs" : "Freeze NPCs");

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java

@@ -50,7 +50,7 @@ public final class RemoteGlobalMenuPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         NoppesUtilServer.sendOpenGui(player, EnumGuiType.GlobalRemote, null);
         if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java

@@ -60,7 +60,7 @@ public final class RemoteMainMenuPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         Entity entity = player.worldObj.getEntityByID(in.readInt());

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java

@@ -46,7 +46,7 @@ public final class RemoteNpcsGetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         NoppesUtilServer.sendNearbyNpcs((EntityPlayerMP) player);
     }

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java

@@ -55,7 +55,7 @@ public final class RemoteResetPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         Entity entity = player.worldObj.getEntityByID(in.readInt());

src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java

@@ -54,7 +54,7 @@ public final class RemoteTpToNpcPacket extends AbstractPacket {
     public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
         if (!(player instanceof EntityPlayerMP))
             return;
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
         Entity entity = player.worldObj.getEntityByID(in.readInt());
         if (!(entity instanceof EntityNPCInterface))

src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathGetPacket.java

@@ -47,7 +47,7 @@ public final class MovingPathGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.PATHER, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.PATHER, player))
             return;
 
         GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.ais.writeToNBT(new NBTTagCompound()));

src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathSavePacket.java

@@ -61,7 +61,7 @@ public final class MovingPathSavePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.PATHER, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.PATHER, player))
             return;
 
         npc.ais.setMovingPath(NBTTags.getIntegerArraySet(ByteBufUtils.readNBT(in).getTagList("MovingPathNew", 10)));

src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetNamesPacket.java

@@ -54,7 +54,7 @@ public final class PlayerDataGetNamesPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int id = in.readInt();

src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java

@@ -47,7 +47,7 @@ public final class PlayerDataMapRegenPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NoppesUtilServer.regenPlayerData((EntityPlayerMP) player);

src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java

@@ -74,7 +74,7 @@ public final class PlayerDataRemovePacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         NoppesUtilServer.removePlayerData(in, (EntityPlayerMP) player);

src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoriesGetPacket.java

@@ -41,7 +41,7 @@ public final class QuestCategoriesGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
+        if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
             return;
 
         NoppesUtilServer.sendQuestCategoryData((EntityPlayerMP) player);

src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java

@@ -51,7 +51,7 @@ public final class QuestCategoryGetPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
+        if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
             return;
 
         int id = in.readInt();