Prevent comp drawer from accepting inventory into invalid slots

jaquadro · Jan 30, 2015 · 166f5ef · 166f5ef
1 parent 0444809
commit 166f5ef
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java
@@ -63,7 +63,11 @@ public boolean canInsertItem (int slot, ItemStack item, int side) {
         if (slot < lowerThresh || slot >= upperThresh)
             return false;
 
-        IDrawer drawer = group.getDrawer(getDrawerSlot(slot));
+        int baseSlot = getDrawerSlot(slot);
+        if (!group.isDrawerEnabled(baseSlot))
+            return false;
+
+        IDrawer drawer = group.getDrawer(baseSlot);
         if (drawer == null)
             return false;
 
@@ -80,7 +84,11 @@ public boolean canExtractItem (int slot, ItemStack item, int side) {
         if (slot < lowerThresh || slot >= upperThresh)
             return false;
 
-        IDrawer drawer = group.getDrawer(getDrawerSlot(slot));
+        int baseSlot = getDrawerSlot(slot);
+        if (!group.isDrawerEnabled(baseSlot))
+            return false;
+
+        IDrawer drawer = group.getDrawer(baseSlot);
         if (drawer == null)
             return false;