diff --git a/src/main/java/kamkeel/npcs/network/PacketUtil.java b/src/main/java/kamkeel/npcs/network/PacketUtil.java index c3467c6de..314d00b7d 100644 --- a/src/main/java/kamkeel/npcs/network/PacketUtil.java +++ b/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; } diff --git a/src/main/java/kamkeel/npcs/network/packets/player/item/GuiMagicBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/item/GuiMagicBookPacket.java index 0acb833d0..5b719ba13 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/item/GuiMagicBookPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/player/item/GuiPaintbrushPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/item/GuiPaintbrushPacket.java index f6492c2ac..ebbd66eff 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/item/GuiPaintbrushPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java index 7c0aa4284..d7ae3d7fd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/GuiRequestPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/GuiRequestPacket.java index 6b822594a..ede37de4b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/GuiRequestPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java index 9d0ec6b4b..cd8dbd71a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java index 8e297fa10..4c20a1012 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java index 5facb2c5d..0fa6fea87 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java +++ b/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()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TileEntityGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TileEntityGetPacket.java index 511fea361..2ccb99189 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/TileEntityGetPacket.java +++ b/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()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java index 5b2a9a902..c1fc4e5e3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java +++ b/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)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java index 66c68c4c9..3aa357314 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java index a577891fe..0a7e32845 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java index 4aa8a4778..aa0bee42b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java index a34e82c1d..3f7dbb996 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java index 83c5ef33e..a2bc51d0a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java index e49a50e39..ddee1a8b3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java index fb21141de..f83ca3db5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java index 42c29b719..63476dc2d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java index 9c14168b1..3d5242f09 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsPacket.java index 2e17e72a0..bc4b360ec 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsShortPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsShortPacket.java index ef3ec908c..349032e7d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneAllTagsShortPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneListPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneListPacket.java index 20013b469..87bac4a29 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneListPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/ClonePreSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/ClonePreSavePacket.java index cbcc6ecf5..378145ddb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/ClonePreSavePacket.java +++ b/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; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneRemovePacket.java index 282aeac99..ce1fcb367 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java index 8b6fb39a1..72501a9bb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java index fe264d20a..4d7b21aac 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneTagListPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java index aacc85a20..d5440f82e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java +++ b/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()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java index a8d2b6e33..7af87fd07 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java +++ b/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()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java index e948fdda8..135b55d91 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java index 9ccad6677..902d5e5d0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java +++ b/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) { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java index 6623c3af4..81d716032 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java index ab3d87abe..adae2de93 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java index 2a0aec2c2..44a59246f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java +++ b/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()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java index cae4b9c80..4679715c2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java index 9dec75c0f..2637b2ef4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java index acfc77001..78a61d01d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java index 22a917eb9..629856f49 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java index c221e043e..716a53feb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogsGetPacket.java index 9ea47415a..03dc47b56 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogsGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectGetPacket.java index 0b9d8613e..0360a8e0b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectRemovePacket.java index 3b80a3f43..6af210b64 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectSavePacket.java index 1990fb205..785ccdf4f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectsGetPacket.java index da144f4ab..e202312ba 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/effects/EffectsGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java index 9056337ec..d7bf394a7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java index cc0a0aa0d..a9a09bd22 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java index 892c31c6e..8a57d842d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java index b63093ef0..cb08c49e9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionsGetPacket.java index 17431ae99..0e6fa761e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionsGetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java index 2c5c5fcdd..65f18be9f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/item/ColorBrushPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/item/ColorBrushPacket.java index 6da217d7e..0a9f755ae 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/item/ColorBrushPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/item/ColorSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/item/ColorSetPacket.java index 3eef85569..5a1105b85 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/item/ColorSetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/item/HammerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/item/HammerPacket.java index 8f42c100e..f050d0370 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/item/HammerPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java index 9d65e3d91..b9b3924c1 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java +++ b/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) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java index 9d2eb9152..88595b60b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java +++ b/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()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java index 7e1d17fb8..f6b7fa2dc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java +++ b/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) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java index ceb49b232..b9f7a55d3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java +++ b/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) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java index 272eefbcd..3825f8c82 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java +++ b/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()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java index 2752fdffc..40cad7db5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java +++ b/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()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java index a0ec9dabf..87bf75388 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemRemovePacket.java index fd45ff852..b6df011bd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemRemovePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemSavePacket.java index 2c76c3a1f..d7fd58eeb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java index 75fe6ed18..744a42269 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java index 5c160b94f..a6a0cfaaf 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java index f6433700f..c9cb4836b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java index 0ef13a253..b2181c6ba 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java +++ b/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()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java index f9b08b0e4..d3c5ef841 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java index b75084916..7e5b0c765 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java index bb5736c6d..08b621a98 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java +++ b/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())); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java index 89bdd6ea5..f48421fd6 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java +++ b/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)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java index 659a26a41..f62a1498f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java +++ b/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())); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java index c1a5c8e84..6dbe9deea 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java index 2fb0667a9..c5ff1694f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java +++ b/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)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java index c0e658dec..c2cb25525 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java +++ b/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())); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java index 0cea8d821..d9bf84489 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java +++ b/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)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java index 5e61a05e8..5ae278295 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java +++ b/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())); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java index ee8b43ff8..28f9827ad 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java +++ b/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)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java index e987d6426..474b09da7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java +++ b/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())); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java index f53a221b3..5637375b2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java +++ b/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)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java index 4a0b504a5..64b7c026e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java index 7294874f6..398c7b545 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java index a4e0fa878..7448731ac 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java index ef465e493..2d042b462 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java index 382042539..9f4825d82 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java +++ b/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) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java index 53cbb4e2c..cdf0c3821 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java index 373b75823..62df0b948 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java +++ b/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) { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java index d77ae543d..c871e5d11 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java index 7eeede76c..dd9f621ae 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java +++ b/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"); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java index 0604bedae..f212f6102 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java +++ b/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"); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java index e2f4a2af2..89887815a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java +++ b/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) { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java index 5f9d1480b..bd50e6deb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java +++ b/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()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java index 6d4e84647..6cdb43e5e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java +++ b/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); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java index 15eb7945b..f90acfe2a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java +++ b/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()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java index 7b4ddf036..587832ad4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java +++ b/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)) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathGetPacket.java index 6f5679e68..4a9f594c2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathGetPacket.java +++ b/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())); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathSavePacket.java index 258e76e37..75bc71c28 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/pather/MovingPathSavePacket.java +++ b/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))); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetNamesPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetNamesPacket.java index cc5431e4a..707452806 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetNamesPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java index dec497e86..a05b527f3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java index 7002a7f06..fbe8c7991 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoriesGetPacket.java index 3448acf92..743c9a075 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoriesGetPacket.java +++ b/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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java index 0404a5ab8..5d8f8c571 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java +++ b/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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java index bad9bfe95..333d77da4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java @@ -55,7 +55,7 @@ public final class QuestCategoryRemovePacket 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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java index 76695d132..f4a28b443 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java @@ -58,7 +58,7 @@ public final class QuestCategorySavePacket 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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java index e78955678..c3080f586 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java @@ -63,7 +63,7 @@ public final class QuestDialogGetTitlePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; Dialog quest = DialogController.Instance.dialogs.get(in.readInt()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java index 4ccb34399..979f21f47 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java @@ -48,7 +48,7 @@ public final class QuestGetPacket 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; Quest quest = QuestController.Instance.quests.get(in.readInt()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java index 83d175d6d..e6673f877 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java @@ -56,7 +56,7 @@ public final class QuestOpenGuiPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; int gui = in.readInt(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestRemovePacket.java index 176e63364..622f36375 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestRemovePacket.java @@ -58,7 +58,7 @@ public final class QuestRemovePacket 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; Quest quest = QuestController.Instance.quests.get(in.readInt()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java index 7a5f6f65e..9fdfbb78e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java @@ -64,7 +64,7 @@ public final class QuestSavePacket 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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestsGetPacket.java index 206f7d375..fa0ba0c3d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestsGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestsGetPacket.java @@ -53,7 +53,7 @@ public final class QuestsGetPacket 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; QuestCategory category = QuestController.Instance.categories.get(in.readInt()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java index 31b0223d9..34f41df20 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java @@ -54,7 +54,7 @@ public final class RecipeGetPacket 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(); boolean anvil = in.readBoolean(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java index b0bbbdf67..6616ce33a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java @@ -59,7 +59,7 @@ public final class RecipeRemovePacket 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(); boolean anvil = in.readBoolean(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java index 59d4f8a57..428925691 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java @@ -58,7 +58,7 @@ public final class RecipeSavePacket 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); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java index cf148693d..3172556c8 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java @@ -46,7 +46,7 @@ public final class RecipesGetPacket 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(); NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, id); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java index 5d33af2cd..d64203eca 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java @@ -61,7 +61,7 @@ public final class RoleCompanionUpdatePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; if (npc.advanced.role != EnumRoleType.Companion) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java index 2bf45aa26..762a34ca4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java @@ -47,7 +47,7 @@ public final class RoleGetPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; if (npc.roleInterface == null) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java index 4dbcfe234..d63f2603c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java @@ -60,7 +60,7 @@ public final class RoleSavePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; npc.roleInterface.readFromNBT(ByteBufUtils.readNBT(in)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java index b6a9553b1..72d3c66bc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java @@ -77,7 +77,7 @@ public final class EventScriptPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.SCRIPTER)) return; Action requestedAction = Action.values()[in.readInt()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java index 0083ff283..11d625988 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java @@ -71,7 +71,7 @@ public final class ForgeScriptPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.SCRIPTER)) return; Action requestedAction = Action.values()[in.readInt()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java index 9f9d72210..bb07fac73 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java @@ -71,7 +71,7 @@ public final class GlobalNPCScriptPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.SCRIPTER)) return; Action requestedAction = Action.values()[in.readInt()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java index 2a775ea30..c2dc13165 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java @@ -72,7 +72,7 @@ public final class NPCScriptPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.SCRIPTER)) return; Action requestedAction = Action.values()[in.readInt()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java index edd2768eb..93b7cc387 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java @@ -71,7 +71,7 @@ public final class PlayerScriptPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.SCRIPTER)) return; Action requestedAction = Action.values()[in.readInt()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java index 7a8f5fe39..337522882 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java @@ -63,7 +63,7 @@ public final class ScriptInfoPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.SCRIPTER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.SCRIPTER)) return; Action requestedAction = Action.values()[in.readInt()]; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagGetPacket.java index 6438fd4b4..2a565c828 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagGetPacket.java @@ -48,7 +48,7 @@ public final class TagGetPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) return; NBTTagCompound compound = new NBTTagCompound(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java index 8d3d90a81..3b963b8ad 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java @@ -63,7 +63,7 @@ public final class TagRemovePacket 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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java index 6b79c5b8b..e52ecd548 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java @@ -64,7 +64,7 @@ public final class TagSavePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; Tag tag = new Tag(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java index e7f016106..93a26505e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java @@ -62,7 +62,7 @@ public final class TagSetPacket extends AbstractPacket { public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) return; this.setTags(npc, in); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsGetPacket.java index 4b303b65e..4414131f1 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsGetPacket.java @@ -38,7 +38,7 @@ public final class TagsGetPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) return; NoppesUtilServer.sendTagDataAll((EntityPlayerMP) player); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsNpcGetPacket.java index cba3e9de9..305386fb9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsNpcGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagsNpcGetPacket.java @@ -49,7 +49,7 @@ public final class TagsNpcGetPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) + if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER)) return; NBTTagCompound compound = new NBTTagCompound(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java index 6b1b49c77..95a8d66d0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java @@ -53,7 +53,7 @@ public final class TransformGetPacket 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.transform.writeOptions(new NBTTagCompound())); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java index 7f609099a..bd651539e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java @@ -58,7 +58,7 @@ public final class TransformLoadPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; if (npc.transform.isValid()) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java index 4d89ffe15..2e8f82f34 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java @@ -60,7 +60,7 @@ public final class TransformSavePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; boolean isValid = npc.transform.isValid(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java index 800befc48..c59e072ef 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java @@ -41,7 +41,7 @@ public final class TransportCategoriesGetPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; NoppesUtilServer.sendTransportCategoryData((EntityPlayerMP) player); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java index ca85a6f51..8cef5cf34 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java @@ -55,7 +55,7 @@ public final class TransportCategoryRemovePacket 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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java index d443c1c5c..86bec4b99 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java @@ -58,7 +58,7 @@ public final class TransportCategorySavePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; String name = ByteBufUtils.readString(in); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java index dbcbe2bd9..acbbe8016 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java @@ -49,7 +49,7 @@ public final class TransportGetLocationPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; - if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return; if (npc.advanced.role != EnumRoleType.Transporter) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java index fe9e12922..b309c0e16 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java @@ -56,7 +56,7 @@ public final class TransportRemovePacket 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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java index edca6ee97..f31a3ab1b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java @@ -67,7 +67,7 @@ public final class TransportSavePacket 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(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java index 4569b7a40..64c5d7b71 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java @@ -48,7 +48,7 @@ public final class TransportsGetPacket 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();