From d312fecc2ae846cc4a8d314541e2ac9a3489635b Mon Sep 17 00:00:00 2001
From: Buuz135 <buuz135@hotmail.com>
Date: Mon, 21 Mar 2022 20:28:20 +0100
Subject: [PATCH] Storage Controller won't insert into empty drawers anymore
 when interacting, closes #21

---
 .../functionalstorage/block/tile/DrawerControllerTile.java    | 4 +---
 .../functionalstorage/inventory/BigInventoryHandler.java      | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java
index c05eca7..b756ed4 100644
--- a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java
+++ b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java
@@ -76,15 +76,13 @@ public class DrawerControllerTile extends ControllableDrawerTile<DrawerControlle
             return InteractionResult.PASS;
         if (isServer()) {
             for (int slot = 0; slot < getStorage().getSlots(); slot++) {
-                if (!stack.isEmpty() && getStorage().insertItem(slot, stack, true).getCount() != stack.getCount()) {
+                if (!stack.isEmpty() && !getStorage().getStackInSlot(slot).isEmpty() && getStorage().insertItem(slot, stack, true).getCount() != stack.getCount()) {
                     playerIn.setItemInHand(hand, getStorage().insertItem(slot, stack, false));
                     return InteractionResult.SUCCESS;
                 } else if (System.currentTimeMillis() - INTERACTION_LOGGER.getOrDefault(playerIn.getUUID(), System.currentTimeMillis()) < 300) {
-                    boolean worked = false;
                     for (ItemStack itemStack : playerIn.getInventory().items) {
                         if (!itemStack.isEmpty() && !getStorage().getStackInSlot(slot).isEmpty() && getStorage().insertItem(slot, itemStack, true).getCount() != itemStack.getCount()) {
                             itemStack.setCount(getStorage().insertItem(slot, itemStack.copy(), false).getCount());
-                            worked = true;
                         }
                     }
                 }
diff --git a/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java b/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java
index 32cf8ce..56bc1e4 100644
--- a/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java
+++ b/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java
@@ -106,6 +106,7 @@ public abstract class BigInventoryHandler implements IItemHandler, INBTSerializa
         if (slot < type.getSlots()){
             BigStack bigStack = this.storedStacks.get(slot);
             ItemStack fl = bigStack.getStack();
+            if (isLocked() && fl.isEmpty()) return false;
             return fl.isEmpty() || (fl.sameItem(stack) && ItemStack.tagMatches(fl, stack));
         }
         return false;