From 598491fe8c14638fdf3972f1bed915606631f0ac Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 18 Feb 2025 04:36:53 -0500 Subject: [PATCH] Hook Up Effects Packet Permissions --- .../packets/request/effects/EffectGetPacket.java | 9 ++++++++- .../packets/request/effects/EffectRemovePacket.java | 13 +++++++++++++ .../packets/request/effects/EffectSavePacket.java | 13 +++++++++++++ .../packets/request/effects/EffectsGetPacket.java | 9 ++++++++- 4 files changed, 42 insertions(+), 2 deletions(-) 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 709cb560f..140fc591b 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 @@ -4,6 +4,8 @@ import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import net.minecraft.entity.player.EntityPlayer; @@ -43,7 +45,12 @@ public final class EffectGetPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - effectID = in.readInt(); + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + int effectID = in.readInt(); NBTTagCompound compound = new NBTTagCompound(); if (effectID != -1 && CustomEffectController.getInstance().has(effectID)) { CustomEffect Effect = (CustomEffect) CustomEffectController.getInstance().get(effectID); 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 b39f4b366..b8d4232f7 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 @@ -4,11 +4,14 @@ import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.data.CustomEffect; @@ -36,6 +39,11 @@ public class EffectRemovePacket extends AbstractPacket { return PacketHandler.REQUEST_PACKET; } + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_EFFECT; + } + @Override public void sendData(ByteBuf out) throws IOException { out.writeInt(this.effectID); @@ -43,6 +51,11 @@ public class EffectRemovePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int effectID = in.readInt(); CustomEffectController.getInstance().delete(effectID); NoppesUtilServer.sendCustomEffectDataAll((EntityPlayerMP) player); 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 33bf554c0..de67d9017 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 @@ -4,11 +4,14 @@ import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.data.CustomEffect; @@ -38,6 +41,11 @@ public class EffectSavePacket extends AbstractPacket { return PacketHandler.REQUEST_PACKET; } + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_EFFECT; + } + @Override public void sendData(ByteBuf out) throws IOException { ByteBufUtils.writeString(out, prevName); @@ -46,6 +54,11 @@ public class EffectSavePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + String prevName = ByteBufUtils.readString(in); CustomEffect effect = new CustomEffect(); 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 fee4e0517..b63cfd8ad 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 @@ -4,6 +4,8 @@ import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import net.minecraft.entity.player.EntityPlayer; @@ -42,7 +44,12 @@ public final class EffectsGetPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - this.effectID = in.readInt(); + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + int effectID = in.readInt(); if (effectID != -1) { CustomEffect effect = (CustomEffect) CustomEffectController.getInstance().get(effectID);