From 752c65698c318e18a9469dbd9676657bb2fea0f6 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 18 Dec 2015 11:15:05 +0000 Subject: [PATCH] Do not drop drawer contents if the drawer has the creative vending upgrade --- .../storagedrawers/block/BlockDrawers.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 23f36e2..cb6f163 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -465,17 +465,19 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH dropBlockAsItem(world, x, y, z, stack); } - for (int i = 0; i < tile.getDrawerCount(); i++) { - if (!tile.isDrawerEnabled(i)) - continue; + if (!tile.isVending()) { + for (int i = 0; i < tile.getDrawerCount(); i++) { + if (!tile.isDrawerEnabled(i)) + continue; - IDrawer drawer = tile.getDrawer(i); - while (drawer.getStoredItemCount() > 0) { - ItemStack stack = tile.takeItemsFromSlot(i, drawer.getStoredItemStackSize()); - if (stack == null || stack.stackSize == 0) - break; + IDrawer drawer = tile.getDrawer(i); + while (drawer.getStoredItemCount() > 0) { + ItemStack stack = tile.takeItemsFromSlot(i, drawer.getStoredItemStackSize()); + if (stack == null || stack.stackSize == 0) + break; - dropStackInBatches(world, x, y, z, stack); + dropStackInBatches(world, x, y, z, stack); + } } }