diff --git a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java index d2b43b1..01a2ffc 100644 --- a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java +++ b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java @@ -190,8 +190,11 @@ public abstract class BaseContainer extends C // 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