From f6fc653dd76ead4b214ad76d029086c8f7f620a5 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 16:57:28 +0800 Subject: [PATCH] fixed items not dropping on drawer break (drawer somehow has a dupe) --- .../storagedrawers/block/BlockDrawers.java | 2 +- .../block/tile/TileEntityDrawers.java | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 342fbfc..adf5536 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -583,7 +583,7 @@ public class BlockDrawers extends BlockContainer implements INetworked, IExtende if (!drawer.isDrawerEnabled(drawerIndex)) return; IDrawer subDrawer = drawer.getDrawer(drawerIndex); while (subDrawer.getStoredItemCount() > 0) { - ItemStack stack = drawer.takeItemsFromSlot(drawerIndex, subDrawer.getStoredItemStackSize()); + ItemStack stack = drawer.takeItemsFromSlotWithDestroy(drawerIndex, subDrawer.getStoredItemStackSize()); if (stack == null || stack.stackSize == 0) break; action.accept(stack); } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 9bd6945..74c2687 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -73,7 +73,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private int ticksClickedInARow = 9; private int itemsOutputInARow = 0; - public boolean clickedOnPreviousTick = false; + private boolean clickedOnPreviousTick = false; private UUID owner; private String securityKey; @@ -596,7 +596,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe int ticksConsecutiveClickRequirement = 50 / (itemsOutputInARow + 5); - if (ticksClickedInARow < ticksConsecutiveClickRequirement) return null; + if (ticksClickedInARow < ticksConsecutiveClickRequirement) return stack; ticksClickedInARow = 0; itemsOutputInARow++; @@ -614,6 +614,23 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return stack; } + public ItemStack takeItemsFromSlotWithDestroy(int slot, int count) { + if (slot < 0 || slot >= getDrawerCount()) return null; + + ItemStack stack = getItemsFromSlot(slot, count); + if (stack == null) return null; + + IDrawer drawer = drawers[slot]; + drawer.setStoredItemCount(drawer.getStoredItemCount() - stack.stackSize); + + if (isRedstone() && worldObj != null) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord - 1, zCoord, getBlockType()); + } + + return stack; + } + /** * Returns an ItemStack that will have a maximum size of {@link ItemStack#getMaxStackSize()} */