mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fix desync between server and client for personal chest. Fixes #5438
This commit is contained in:
4 files changed
+9
-13
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -24,8 +24,7 @@ public class PacketPersonalChest implements IMessageHandler<PersonalChestMessage
|
||||
public IMessage onMessage(PersonalChestMessage message, MessageContext context) {
|
||||
EntityPlayer player = PacketHandler.getPlayer(context);
|
||||
|
||||
PacketHandler.handlePacket(() ->
|
||||
{
|
||||
PacketHandler.handlePacket(() -> {
|
||||
if (message.packetType == PersonalChestPacketType.SERVER_OPEN) {
|
||||
try {
|
||||
if (message.isBlock) {
|
||||
@@ -36,7 +35,7 @@ public class PacketPersonalChest implements IMessageHandler<PersonalChestMessage
|
||||
ItemStack stack = player.getHeldItem(message.currentHand);
|
||||
|
||||
if (MachineType.get(stack) == MachineType.PERSONAL_CHEST) {
|
||||
InventoryPersonalChest inventory = new InventoryPersonalChest(player, message.currentHand);
|
||||
InventoryPersonalChest inventory = new InventoryPersonalChest(stack, message.currentHand);
|
||||
MekanismUtils.openPersonalChestGui((EntityPlayerMP) player, null, inventory, false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user