From ca4b7b4f181e65bc0f62f99fbeb8c3a2c0c53aa7 Mon Sep 17 00:00:00 2001
From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Date: Wed, 4 May 2022 16:17:09 +0800
Subject: fix negative tool (#1049)

---
 .../implementations/GT_MetaTileEntity_Hatch_Maintenance.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
index 1321ce29ab..25fed1f204 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
@@ -280,8 +280,13 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
     private void applyToolbox(ItemStack aStack, EntityPlayer aPlayer) {
         ItemToolbox aToolbox = (ItemToolbox) aStack.getItem();
         IHasGui aToolboxGUI = aToolbox.getInventory(aPlayer, aStack);
-        for (int i=0; i<aToolboxGUI.getSizeInventory(); i++)
-            onToolClick(aToolboxGUI.getStackInSlot(i), aPlayer, aToolboxGUI);
+        for (int i = 0; i < aToolboxGUI.getSizeInventory(); i ++) {
+            if (aToolboxGUI.getStackInSlot(i) != null) {
+                onToolClick(aToolboxGUI.getStackInSlot(i), aPlayer, aToolboxGUI);
+                if (aToolboxGUI.getStackInSlot(i) != null && aToolboxGUI.getStackInSlot(i).stackSize <= 0)
+                    aToolboxGUI.setInventorySlotContents(i, null);
+            }
+        }
     }
 
     @Override
-- 
cgit