Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/1.21

core/src/main/java/org/geysermc/geyser/translator/inventory/chest/DoubleChestInventoryTranslator.java

@@ -64,7 +64,7 @@ public class DoubleChestInventoryTranslator extends ChestInventoryTranslator {
         if (session.getLastInteractionPlayerPosition().equals(session.getPlayerEntity().getPosition())) {
             BlockState state = session.getGeyser().getWorldManager().blockAt(session, session.getLastInteractionBlockPosition());
             if (!BlockRegistries.CUSTOM_BLOCK_STATE_OVERRIDES.get().containsKey(state.javaId())) {
-                if (state.block() == Blocks.CHEST || state.block() == Blocks.TRAPPED_CHEST
+                if ((state.block() == Blocks.CHEST || state.block() == Blocks.TRAPPED_CHEST)
                         && state.getValue(Properties.CHEST_TYPE) != ChestType.SINGLE) {
                     inventory.setHolderPosition(session.getLastInteractionBlockPosition());
                     ((Container) inventory).setUsingRealBlock(true, state.block());

core/src/main/java/org/geysermc/geyser/translator/level/block/entity/DoubleChestBlockEntityTranslator.java

@@ -42,10 +42,12 @@ public class DoubleChestBlockEntityTranslator extends BlockEntityTranslator impl
 
     @Override
     public void translateTag(GeyserSession session, NbtMapBuilder bedrockNbt, NbtMap javaNbt, BlockState blockState) {
+        if (blockState.getValue(Properties.CHEST_TYPE) != ChestType.SINGLE) {
             int x = (int) bedrockNbt.get("x");
             int z = (int) bedrockNbt.get("z");
             translateChestValue(bedrockNbt, blockState, x, z);
         }
+    }
 
     /**
      * Add Bedrock block entity tags to a NbtMap based on Java properties