Merge branch 'mergeGTNH' into experimental

1 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java
index d939307971..49aa1d9fe8 100644
--- a/src/main/java/gregtech/api/gui/GT_Container.java
+++ b/src/main/java/gregtech/api/gui/GT_Container.java
@@ -313,10 +313,9 @@ public class GT_Container extends Container {
             while (aStack.stackSize > 0 && (!par4 && var6 < aSlotCount || par4 && var6 >= aStartIndex)) {
                 var7 = (Slot) this.inventorySlots.get(var6);
                 var8 = var7.getStack();
-
                 if (!(var7 instanceof GT_Slot_Holo) && !(var7 instanceof GT_Slot_Output) && var8 != null && var8.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == var8.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, var8)) {
                     int var9 = var8.stackSize + aStack.stackSize;
-
+                    if(var8.stackSize<mTileEntity.getInventoryStackLimit()){
                     if (var9 <= aStack.getMaxStackSize()) {
                         aStack.stackSize = 0;
                         var8.stackSize = var9;
@@ -327,7 +326,7 @@ public class GT_Container extends Container {
                         var8.stackSize = aStack.getMaxStackSize();
                         var7.onSlotChanged();
                         var5 = true;
-                    }
+                    }}
                 }
 
                 if (par4) {
@@ -337,7 +336,6 @@ public class GT_Container extends Container {
                 }
             }
         }
-
         if (aStack.stackSize > 0) {
             if (par4) {
                 var6 = aSlotCount - 1;
@@ -350,9 +348,10 @@ public class GT_Container extends Container {
                 var8 = var7.getStack();
 
                 if (var8 == null) {
-                    var7.putStack(GT_Utility.copy(aStack));
+                	int var10 = Math.min(aStack.stackSize, mTileEntity.getInventoryStackLimit());
+                    var7.putStack(GT_Utility.copyAmount(var10, aStack));
                     var7.onSlotChanged();
-                    aStack.stackSize = 0;
+                    aStack.stackSize -= var10;
                     var5 = true;
                     break;
                 }