diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-25 00:30:59 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-25 00:30:59 +0200 |
| commit | 22fdaed16424e926bc2b8ba6ffe0ebed8b7a4c44 (patch) | |
| tree | 46c2a1553c29d2519d253d858ec72159d15019e3 /src/main/java/gregtech/api/util | |
| parent | 31516ba891e2a71e6312bf6acdeef7f39a4eb275 (diff) | |
| download | GT5-Unofficial-22fdaed16424e926bc2b8ba6ffe0ebed8b7a4c44.tar.gz GT5-Unofficial-22fdaed16424e926bc2b8ba6ffe0ebed8b7a4c44.tar.bz2 GT5-Unofficial-22fdaed16424e926bc2b8ba6ffe0ebed8b7a4c44.zip | |
Added simple ItemDistributor implementation, changed MoveOneItemStack
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -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 6b26d1d72b..eea3499e62 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -560,12 +560,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) { |