From 9701d44694f72bd306da7b2d59ef8c18e264f755 Mon Sep 17 00:00:00 2001 From: Azanor Date: Thu, 8 May 2014 10:52:16 +0200 Subject: [PATCH] fix for clientside syncing issues --- .../common/network/PacketSyncBauble.java | 19 ++++++++++++++++++- src/main/resources/changelog.txt | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/baubles/common/network/PacketSyncBauble.java b/src/main/java/baubles/common/network/PacketSyncBauble.java index 33b429b..dcf906e 100644 --- a/src/main/java/baubles/common/network/PacketSyncBauble.java +++ b/src/main/java/baubles/common/network/PacketSyncBauble.java @@ -5,14 +5,18 @@ import io.netty.channel.ChannelHandlerContext; import java.io.IOException; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; import baubles.common.lib.PlayerHandler; public class PacketSyncBauble extends AbstractPacket { int slot; + int dim, playerId; ItemStack bauble=null; public PacketSyncBauble() {} @@ -20,11 +24,15 @@ public class PacketSyncBauble extends AbstractPacket { public PacketSyncBauble(EntityPlayer player, int slot) { this.slot = slot; this.bauble = PlayerHandler.getPlayerBaubles(player).getStackInSlot(slot); + this.playerId = player.getEntityId(); + this.dim = player.dimension; } @Override public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { buffer.writeByte(slot); + buffer.writeInt(playerId); + buffer.writeInt(dim); PacketBuffer pb = new PacketBuffer(buffer); try { pb.writeItemStackToBuffer(bauble); } catch (IOException e) {} } @@ -33,13 +41,22 @@ public class PacketSyncBauble extends AbstractPacket { public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { slot = buffer.readByte(); + playerId = buffer.readInt(); + dim = buffer.readInt(); PacketBuffer pb = new PacketBuffer(buffer); try { bauble = pb.readItemStackFromBuffer(); } catch (IOException e) {} } @Override public void handleClientSide(EntityPlayer player) { - PlayerHandler.getPlayerBaubles(player).stackList[slot]=bauble; + World world = DimensionManager.getWorld(dim); + if (world==null) return; + + Entity p = world.getEntityByID(playerId); + + if (p !=null && p instanceof EntityPlayer) { + PlayerHandler.getPlayerBaubles((EntityPlayer) p).stackList[slot]=bauble; + } } @Override diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index a234efb..7d78412 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -1,3 +1,6 @@ +1.0.0.12 +- fix for baubles being synced to the wrong player on the client + 1.0.0.11 - baubles are now synced to all clients on a server, allowing modders to add visual components or other client-side stuff for baubles.