From a0dd99dc78f235ab983c77917589a96231409eb9 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 31 Jul 2018 09:14:44 +1000 Subject: [PATCH] SPIGOT-4197: Account for double trapped chests By: md_5 --- .../src/main/java/org/bukkit/craftbukkit/block/CraftChest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java index 6a54f2a16..dff5bb517 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -52,7 +52,8 @@ public class CraftChest extends CraftLootable implements Chest int z = this.getZ(); CraftWorld world = (CraftWorld) this.getWorld(); - ITileInventory nms = ((BlockChest) Blocks.CHEST).getInventory(data, world.getHandle(), new BlockPosition(x, y, z), true); + BlockChest blockChest = (BlockChest) (this.getType() == Material.CHEST ? Blocks.CHEST : Blocks.TRAPPED_CHEST); + ITileInventory nms = blockChest.getInventory(data, world.getHandle(), new BlockPosition(x, y, z), true); if (nms instanceof InventoryLargeChest) { inventory = new CraftInventoryDoubleChest((InventoryLargeChest) nms);