From 9692debdcf454d5ad4f06ca040f88273369a4e4f Mon Sep 17 00:00:00 2001 From: pupnewfster Date: Sat, 27 Apr 2019 15:39:29 -0400 Subject: [PATCH] Fix desync between server and client for personal chest. Fixes #5438 --- src/main/java/mekanism/client/ClientProxy.java | 2 +- .../common/inventory/InventoryPersonalChest.java | 13 +++++-------- .../java/mekanism/common/item/ItemBlockMachine.java | 2 +- .../common/network/PacketPersonalChest.java | 5 ++--- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index e1715c609..16c4305ee 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -283,7 +283,7 @@ public class ClientProxy extends CommonProxy { ItemStack stack = entityplayer.getHeldItem(hand); if (MachineType.get(stack) == MachineType.PERSONAL_CHEST) { - InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer, hand); + InventoryPersonalChest inventory = new InventoryPersonalChest(stack, hand); FMLClientHandler.instance() .displayGuiScreen(entityplayer, new GuiPersonalChest(entityplayer.inventory, inventory)); entityplayer.openContainer.windowId = windowId; diff --git a/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java index b81d875d0..3ff6cf90a 100644 --- a/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java @@ -10,16 +10,13 @@ import net.minecraft.util.EnumHand; public class InventoryPersonalChest extends InventoryBasic { - public EntityPlayer entityPlayer; - public ItemStack itemStack = ItemStack.EMPTY; - - public boolean reading; - + private final ItemStack itemStack; + private boolean reading; public EnumHand currentHand = EnumHand.MAIN_HAND; - public InventoryPersonalChest(EntityPlayer player, EnumHand hand) { + public InventoryPersonalChest(ItemStack stack, EnumHand hand) { super("PersonalChest", false, 55); - entityPlayer = player; + itemStack = stack; currentHand = hand; read(); @@ -92,6 +89,6 @@ public class InventoryPersonalChest extends InventoryBasic { } public ItemStack getStack() { - return !itemStack.isEmpty() ? itemStack : entityPlayer.getHeldItem(currentHand); + return itemStack; } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 7f6ee9166..2267bfeac 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -451,7 +451,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } if (SecurityUtils.canAccess(entityplayer, itemstack)) { - InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer, hand); + InventoryPersonalChest inventory = new InventoryPersonalChest(itemstack, hand); MekanismUtils.openPersonalChestGui((EntityPlayerMP) entityplayer, null, inventory, false); } else { SecurityUtils.displayNoAccess(entityplayer); diff --git a/src/main/java/mekanism/common/network/PacketPersonalChest.java b/src/main/java/mekanism/common/network/PacketPersonalChest.java index cd5fef7e5..a3b4bd0d7 100644 --- a/src/main/java/mekanism/common/network/PacketPersonalChest.java +++ b/src/main/java/mekanism/common/network/PacketPersonalChest.java @@ -24,8 +24,7 @@ public class PacketPersonalChest implements IMessageHandler - { + PacketHandler.handlePacket(() -> { if (message.packetType == PersonalChestPacketType.SERVER_OPEN) { try { if (message.isBlock) { @@ -36,7 +35,7 @@ public class PacketPersonalChest implements IMessageHandler