From f85e312c1a4ddab45e5615740f41cff10c09d4a6 Mon Sep 17 00:00:00 2001 From: marcin212 Date: Mon, 5 Jun 2017 19:37:24 +0200 Subject: [PATCH] Fixed wooden tile kicks player from server when placing #90 --- .../java/binnie/core/block/TileEntityMetadata.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index b3c6c6ae..b8d5913a 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -1,6 +1,5 @@ package binnie.core.block; -import binnie.core.network.packet.PacketMetadata; import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -76,7 +75,10 @@ public class TileEntityMetadata extends TileEntity { @Override public void readFromNBT(final NBTTagCompound nbt) { super.readFromNBT(nbt); - this.meta = nbt.getInteger("meta"); + if(world!=null) + setTileMetadata(nbt.getInteger("meta"), world.isRemote); + else + this.meta = nbt.getInteger("meta"); } @Override @@ -103,15 +105,12 @@ public class TileEntityMetadata extends TileEntity { @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { super.onDataPacket(net, pkt); - - if (pkt instanceof PacketMetadata) { - setTileMetadata(((PacketMetadata) pkt).getMetadata(), true); - } + readFromNBT(pkt.getNbtCompound()); } @Override public SPacketUpdateTileEntity getUpdatePacket() { - return new PacketMetadata(pos, meta, getUpdateTag()); + return new SPacketUpdateTileEntity(pos, 0, getUpdateTag()); } public boolean hasDroppedBlock() {