diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java index c4e5b1e2a..6c8222b46 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java @@ -53,6 +53,9 @@ public final class ConfigCommandPacket extends AbstractPacket { EnumConfigOperation configType = EnumConfigOperation.values()[in.readInt()]; if (configType == EnumConfigOperation.FONT) { // Font Configuration String font = ByteBufUtils.readString(in); + if(font == null) + return; + int size = in.readInt(); if (!font.isEmpty()) { ConfigClient.FontType = font; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java index f2b018dc7..93fb772ea 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java @@ -80,13 +80,15 @@ public final class ParticlePacket extends AbstractPacket { float yOffset = buffer.readFloat(); String particle = ByteBufUtils.readString(buffer); - World worldObj = Minecraft.getMinecraft().theWorld; + if(particle != null){ + World worldObj = Minecraft.getMinecraft().theWorld; - Random rand = worldObj.rand; - if (particle.equals("heal")) { - for (int k = 0; k < 6; k++) { - worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0); - worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0); + Random rand = worldObj.rand; + if (particle.equals("heal")) { + for (int k = 0; k < 6; k++) { + worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0); + worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0); + } } } } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java index 2df1e0aa4..c6e54678d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java @@ -61,6 +61,7 @@ public final class GuiOpenBookPacket extends AbstractPacket { int z = in.readInt(); NBTTagCompound nbt = ByteBufUtils.readNBT(in); ItemStack book = ItemStack.loadItemStackFromNBT(nbt); - NoppesUtil.openGUI(player, new GuiBook(player, book, x, y, z)); + if(book != null) + NoppesUtil.openGUI(player, new GuiBook(player, book, x, y, z)); } } 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 b9b7cd136..d4b82f2d9 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 @@ -48,7 +48,9 @@ public final class TransformLoadPacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override - public void sendData(ByteBuf out) throws IOException { } + public void sendData(ByteBuf out) throws IOException { + out.writeBoolean(this.transform); + } @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {