diff options
| author | Martin Robertz <dream-master@gmx.net> | 2017-10-20 20:34:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 20:34:07 +0200 |
| commit | 1574d1b9b6788cae3ac4af3fab3bc84b9486b017 (patch) | |
| tree | a093a2031e547841b7a6b68d22b615e217944340 /src/main/java/gregtech/api/items/GT_MetaBase_Item.java | |
| parent | d43d0b83a82620782b9d1bbcafdaa94716ece7ac (diff) | |
| parent | b97aa11c9baf0a79cfc60eaac957171808028596 (diff) | |
| download | GT5-Unofficial-1574d1b9b6788cae3ac4af3fab3bc84b9486b017.tar.gz GT5-Unofficial-1574d1b9b6788cae3ac4af3fab3bc84b9486b017.tar.bz2 GT5-Unofficial-1574d1b9b6788cae3ac4af3fab3bc84b9486b017.zip | |
Merge branch 'experimental' into GTNH-Item_Pipe_fix
Diffstat (limited to 'src/main/java/gregtech/api/items/GT_MetaBase_Item.java')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaBase_Item.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java index 2ae98b9dfb..2f5174beb7 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -259,7 +259,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci return 0;
//REALLY?? THIS IS THE CULPRIT THAT CHARGES ITEMS AT INSTANT!!!
//long tChargeBefore = getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE ? Long.MAX_VALUE : Math.min(Math.abs(tStats[0]), tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
- long tChargeBefore = getRealCharge(aStack), tNewCharge = Math.min(Math.abs(tStats[0]), tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
+ long tTransfer = aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge);
+ long tChargeBefore = getRealCharge(aStack), tNewCharge = Math.min(Math.abs(tStats[0]), Long.MAX_VALUE - tTransfer >= tChargeBefore ? tChargeBefore + tTransfer : Long.MAX_VALUE);
if (!aSimulate) setCharge(aStack, tNewCharge);
return tNewCharge - tChargeBefore;
}
|