diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-07-06 22:36:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 22:36:37 +0200 |
| commit | 8cfd1ff7242e3a6c01742db6334ac0fbe9f48c3d (patch) | |
| tree | 8e019e3a70dffac6901439a6165e799ee8b53abf /src/main/java/gregtech/api/util/GT_Utility.java | |
| parent | 2ec4a8a8c42560619e634a340ac94eed4a7bcf18 (diff) | |
| parent | baa04cc51b82e62279419a2dfc9a26858b6645db (diff) | |
| download | GT5-Unofficial-8cfd1ff7242e3a6c01742db6334ac0fbe9f48c3d.tar.gz GT5-Unofficial-8cfd1ff7242e3a6c01742db6334ac0fbe9f48c3d.tar.bz2 GT5-Unofficial-8cfd1ff7242e3a6c01742db6334ac0fbe9f48c3d.zip | |
Merge pull request #1132 from JohannesGaessler/ItemDistributor
Item Distributor
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_Utility.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 0df458b21f..ec4db394e0 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -550,12 +550,15 @@ 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; + } } } } } - if (tMovedItemCount > 0) return tMovedItemCount; + if (tMovedItemCount > 0) return tMovedItemCount; } if (aDoCheckChests && aTileEntity1 instanceof TileEntityChest) { |