From 17264dc7d11c23071f3a7b2cb361a35330740de2 Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sun, 29 Nov 2020 22:46:39 +0100 Subject: fix over filling quantumchest --- .../tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index 6d97d9011d..257fa10bfa 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -91,7 +91,11 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti ItemStack stack = getItemStack(); if ((mInventory[0] != null) && ((count < getMaxItemCount())|| mVoidOverflow ) && GT_Utility.areStacksEqual(mInventory[0], stack)) { count += mInventory[0].stackSize; - if (count <= getMaxItemCount() || mVoidOverflow ) { + if (mVoidOverflow) { + mInventory[0] = null; + count = getMaxItemCount(); + } + else if (count <= getMaxItemCount()) { mInventory[0] = null; } else { mInventory[0].stackSize = (count - getMaxItemCount()); -- cgit From fa11fa346c5e0bfa192558249acd417c6661a4f6 Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Mon, 30 Nov 2020 20:15:34 +0100 Subject: ony set to max if it has to much --- .../storage/GT_MetaTileEntity_DigitalChestBase.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index 257fa10bfa..606733658b 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -91,14 +91,15 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti ItemStack stack = getItemStack(); if ((mInventory[0] != null) && ((count < getMaxItemCount())|| mVoidOverflow ) && GT_Utility.areStacksEqual(mInventory[0], stack)) { count += mInventory[0].stackSize; - if (mVoidOverflow) { - mInventory[0] = null; - count = getMaxItemCount(); - } - else if (count <= getMaxItemCount()) { + + if (count <= getMaxItemCount()) { mInventory[0] = null; } else { - mInventory[0].stackSize = (count - getMaxItemCount()); + if (mVoidOverflow) { + mInventory[0] = null; + } else { + mInventory[0].stackSize = (count - getMaxItemCount()); + } count = getMaxItemCount(); } } -- cgit