mirror of
https://github.com/GTNewHorizons/StorageDrawers.git
synced 2026-11-20 12:20:05 +00:00
Fix potential sources of crashing with comp drawers.
This commit is contained in:
1 parent
6bc04b4e1e
commit
983f20944e
2 files changed
+7
-4
No files matched your search
@@ -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];
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in new issue
Block a user