Fix shift-clicking discarding the remainder when it could fill up ano…

…ther stack
SlimeKnights · Mar 4, 2016 · 8461f76 · 8461f76
1 parent de49958
commit 8461f76
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java
@@ -190,8 +190,11 @@ else if(!this.mergeItemStack(itemstack1, 0, playerInventoryStart, false)) {
 
   // Fix for a vanilla bug: doesn't take Slot.getMaxStackSize into account
   protected boolean mergeItemStack(ItemStack stack, int startIndex, int endIndex, boolean useEndIndex) {
-    return mergeItemStackRefill(stack, startIndex, endIndex, useEndIndex)
-           || mergeItemStackMove(stack, startIndex, endIndex, useEndIndex);
+    boolean ret = mergeItemStackRefill(stack, startIndex, endIndex, useEndIndex);
+    if(stack != null && stack.stackSize > 0) {
+      ret |= mergeItemStackMove(stack, startIndex, endIndex, useEndIndex);
+    }
+    return ret;
   }
 
   // only refills items that are already present