From 255c7ac0d2634d91a7319233703f13bf766bfb16 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:22:05 -0500 Subject: [PATCH] Revert "Add barrel as a valid single chest block" Barrels are a bit more complicated to lump in with chests for the time being. It *can* be fixed, but it requires workarounds. This reverts commit 07f36affb91a2f507e06b8dd2eb3202bf76c469e. --- .../translators/chest/SingleChestInventoryTranslator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java index 0f3b8ecb9..42b23d5b4 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/SingleChestInventoryTranslator.java @@ -37,10 +37,10 @@ public class SingleChestInventoryTranslator extends ChestInventoryTranslator { public SingleChestInventoryTranslator(int size) { super(size, 27); this.holder = new BlockInventoryHolder("minecraft:chest[facing=north,type=single,waterlogged=false]", ContainerType.CONTAINER, - "minecraft:ender_chest", "minecraft:trapped_chest", "minecraft:barrel") { + "minecraft:ender_chest", "minecraft:trapped_chest") { @Override protected boolean isValidBlock(String[] javaBlockString) { - if (javaBlockString[0].equals("minecraft:ender_chest") || javaBlockString[0].equals("minecraft:barrel")) { + if (javaBlockString[0].equals("minecraft:ender_chest")) { // Can't have double ender chests return true; }