diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index d53cb61d0..1e573ad1d 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -335,7 +335,6 @@ public class PacketHandler { REQUEST_PACKET.registerPacket(new MagicSavePacket()); REQUEST_PACKET.registerPacket(new MagicRemovePacket()); REQUEST_PACKET.registerPacket(new MagicGetPacket()); - REQUEST_PACKET.registerPacket(new MagicDataGetPacket()); REQUEST_PACKET.registerPacket(new MagicNpcGetPacket()); REQUEST_PACKET.registerPacket(new MagicNpcSavePacket()); diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java index 1d3dbf7c2..e2f7dad5e 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java @@ -201,5 +201,4 @@ public enum EnumRequestPacket { MagicSave, NpcMagicGet, NpcMagicSave, - MagicDataGet, } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicDataGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicDataGetPacket.java deleted file mode 100644 index e6eae37ea..000000000 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicDataGetPacket.java +++ /dev/null @@ -1,46 +0,0 @@ -package kamkeel.npcs.network.packets.request.magic; - -import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.AbstractPacket; -import kamkeel.npcs.network.PacketChannel; -import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumRequestPacket; -import kamkeel.npcs.util.ByteBufUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.NoppesUtilServer; - -import java.io.IOException; - -public final class MagicDataGetPacket extends AbstractPacket { - public static final String packetName = "Request|MagicDataGet"; - - public MagicDataGetPacket() {} - - @Override - public Enum getType() { - return EnumRequestPacket.MagicDataGet; - } - - @Override - public PacketChannel getChannel() { - return PacketHandler.REQUEST_PACKET; - } - - @Override - public boolean needsNPC() { - return true; - } - - @Override - public void sendData(ByteBuf out) throws IOException {} - - @Override - public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if (!(player instanceof EntityPlayerMP)) - return; - -// String playerName = ByteBufUtils.readString(in); -// NoppesUtilServer.sendPlayerDataInfo(playerName, (EntityPlayerMP) player); - } -} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataSaveInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataSaveInfoPacket.java index e5ae5ea68..443012bd0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataSaveInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataSaveInfoPacket.java @@ -9,6 +9,7 @@ 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.constants.EnumPlayerData; @@ -39,6 +40,12 @@ public final class PlayerDataSaveInfoPacket extends AbstractPacket { return PacketHandler.REQUEST_PACKET; } + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_PLAYERDATA; + } + + @Override public void sendData(ByteBuf out) throws IOException { ByteBufUtils.writeString(out, playerName);