From 32f66371d97620e7ea4bda3a5a0ca7a5c75b510c Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Fri, 8 Mar 2024 22:30:17 +0100
Subject: [PATCH] Should resolve https://github.com/GeyserMC/Geyser/issues/4121
 (#4481)

---
 .../inventory/PlayerInventoryTranslator.java         | 12 ++++++++++++
 .../entity/player/BedrockInteractTranslator.java     | 11 +----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/inventory/PlayerInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/PlayerInventoryTranslator.java
index 613121dfd..1447f2b5b 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/inventory/PlayerInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/PlayerInventoryTranslator.java
@@ -44,6 +44,8 @@ import org.cloudburstmc.protocol.bedrock.data.inventory.itemstack.request.action
 import org.cloudburstmc.protocol.bedrock.data.inventory.itemstack.request.action.SwapAction;
 import org.cloudburstmc.protocol.bedrock.data.inventory.itemstack.request.action.TransferItemStackRequestAction;
 import org.cloudburstmc.protocol.bedrock.data.inventory.itemstack.response.ItemStackResponse;
+import org.cloudburstmc.protocol.bedrock.packet.ContainerClosePacket;
+import org.cloudburstmc.protocol.bedrock.packet.ContainerOpenPacket;
 import org.cloudburstmc.protocol.bedrock.packet.InventoryContentPacket;
 import org.cloudburstmc.protocol.bedrock.packet.InventorySlotPacket;
 import org.geysermc.geyser.inventory.*;
@@ -534,10 +536,20 @@ public class PlayerInventoryTranslator extends InventoryTranslator {
 
     @Override
     public void openInventory(GeyserSession session, Inventory inventory) {
+        ContainerOpenPacket containerOpenPacket = new ContainerOpenPacket();
+        containerOpenPacket.setId((byte) 0);
+        containerOpenPacket.setType(org.cloudburstmc.protocol.bedrock.data.inventory.ContainerType.INVENTORY);
+        containerOpenPacket.setUniqueEntityId(-1);
+        containerOpenPacket.setBlockPosition(session.getPlayerEntity().getPosition().toInt());
+        session.sendUpstreamPacket(containerOpenPacket);
     }
 
     @Override
     public void closeInventory(GeyserSession session, Inventory inventory) {
+        ContainerClosePacket packet = new ContainerClosePacket();
+        packet.setServerInitiated(true);
+        packet.setId((byte) ContainerId.INVENTORY);
+        session.sendUpstreamPacket(packet);
     }
 
     @Override
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java
index 4b40bb38e..80141f849 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockInteractTranslator.java
@@ -33,8 +33,6 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.Server
 import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerCommandPacket;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityLinkData;
-import org.cloudburstmc.protocol.bedrock.data.inventory.ContainerType;
-import org.cloudburstmc.protocol.bedrock.packet.ContainerOpenPacket;
 import org.cloudburstmc.protocol.bedrock.packet.InteractPacket;
 import org.cloudburstmc.protocol.bedrock.packet.SetEntityLinkPacket;
 import org.geysermc.geyser.entity.type.Entity;
@@ -126,14 +124,7 @@ public class BedrockInteractTranslator extends PacketTranslator<InteractPacket>
                         ServerboundPlayerCommandPacket openVehicleWindowPacket = new ServerboundPlayerCommandPacket(session.getPlayerEntity().getEntityId(), PlayerState.OPEN_VEHICLE_INVENTORY);
                         session.sendDownstreamGamePacket(openVehicleWindowPacket);
                     } else {
-                        session.setOpenInventory(session.getPlayerInventory());
-
-                        ContainerOpenPacket containerOpenPacket = new ContainerOpenPacket();
-                        containerOpenPacket.setId((byte) 0);
-                        containerOpenPacket.setType(ContainerType.INVENTORY);
-                        containerOpenPacket.setUniqueEntityId(-1);
-                        containerOpenPacket.setBlockPosition(entity.getPosition().toInt());
-                        session.sendUpstreamPacket(containerOpenPacket);
+                        InventoryUtils.openInventory(session, session.getPlayerInventory());
                     }
                 } else {
                     // Case: Player opens a player inventory, while we think it shouldn't have!