From 983f20944eaf14c9bda542e796a600a8f053d1aa Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 23 Nov 2014 03:21:32 -0500 Subject: [PATCH] Fix potential sources of crashing with comp drawers. --- .../minecraft/storagedrawers/block/BlockCompDrawers.java | 8 ++++---- .../minecraft/storagedrawers/block/BlockDrawers.java | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java index 08f4ac1..1a200ef 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java @@ -89,9 +89,9 @@ public class BlockCompDrawers extends BlockDrawers if (side == tile.getDirection()) { if (tile.getStatusLevel() != 3) { - if (tile.getDrawer(2).getStoredItemStackSize() > 0) + if (tile.isDrawerEnabled(2) && tile.getDrawer(2).getStoredItemStackSize() > 0) return iconFront[2]; - else if (tile.getDrawer(1).getStoredItemStackSize() > 0) + else if (tile.isDrawerEnabled(1) && tile.getDrawer(1).getStoredItemStackSize() > 0) return iconFront[1]; else return iconFront[0]; @@ -104,9 +104,9 @@ public class BlockCompDrawers extends BlockDrawers plev = MathHelper.clamp_int((int) (pfull * 6.99), 0, 6); } - if (tile.getDrawer(2).getStoredItemStackSize() > 0) + if (tile.isDrawerEnabled(2) && tile.getDrawer(2).getStoredItemStackSize() > 0) return iconFrontInd[2][plev]; - else if (tile.getDrawer(1).getStoredItemStackSize() > 0) + else if (tile.isDrawerEnabled(1) && tile.getDrawer(1).getStoredItemStackSize() > 0) return iconFrontInd[1][plev]; else return iconFrontInd[0][plev]; diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index e497cf0..6894df1 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -302,6 +302,9 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH dropBlockAsItem(world, x, y, z, new ItemStack(ModItems.upgradeStatus, 1, tile.getStatusLevel())); 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());