diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-07-02 00:09:48 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-07-02 11:09:17 +0200 |
| commit | 67e3b7ddc6e5c7b71e2f9ac5e18c5ca99e075149 (patch) | |
| tree | 1c8b3ab11fa0257b5c1d08f65231960a679c09dd /src/main/java/gregtech/api/util | |
| parent | c9d143126ec634c1dc2447802e5b50e77e1116c8 (diff) | |
| download | GT5-Unofficial-67e3b7ddc6e5c7b71e2f9ac5e18c5ca99e075149.tar.gz GT5-Unofficial-67e3b7ddc6e5c7b71e2f9ac5e18c5ca99e075149.tar.bz2 GT5-Unofficial-67e3b7ddc6e5c7b71e2f9ac5e18c5ca99e075149.zip | |
cherry pick
Item Distributor #1132
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 3ab7d34d6b..0f5a69e8a4 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -553,7 +553,11 @@ public class GT_Utility { if (listContainsItem(aFilter, aTileEntity1.getStackInSlot(tGrabSlots[i]), true, aInvertFilter)) { if (isAllowedToTakeFromSlot(aTileEntity1, tGrabSlots[i], aGrabFrom, aTileEntity1.getStackInSlot(tGrabSlots[i]))) { if (isAllowedToPutIntoSlot((IInventory) aTileEntity2, tPutSlots[j], aPutTo, aTileEntity1.getStackInSlot(tGrabSlots[i]), aMaxTargetStackSize)) { - tMovedItemCount = moveStackFromSlotAToSlotB(aTileEntity1, (IInventory) aTileEntity2, tGrabSlots[i], tPutSlots[j], aMaxTargetStackSize, aMinTargetStackSize, aMaxMoveAtOnce, aMinMoveAtOnce); + tMovedItemCount += moveStackFromSlotAToSlotB(aTileEntity1, (IInventory) aTileEntity2, tGrabSlots[i], tPutSlots[j], aMaxTargetStackSize, aMinTargetStackSize, (byte) (aMaxMoveAtOnce - tMovedItemCount), aMinMoveAtOnce); + if (tMovedItemCount >= aMaxMoveAtOnce) { + return tMovedItemCount; + + } } } } |