diff options
| author | Technus <daniel112092@gmail.com> | 2016-09-06 13:58:24 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-09-21 22:07:13 +0200 |
| commit | c5eeb27cd6e07a3423cc171b0677fea50274272b (patch) | |
| tree | cb1877b2e9a4e6752ac945cc593ab01159942774 /src/main/java/gregtech | |
| parent | 7dfb3e0da98223e8f98071198e0ed04fee78183e (diff) | |
| download | GT5-Unofficial-c5eeb27cd6e07a3423cc171b0677fea50274272b.tar.gz GT5-Unofficial-c5eeb27cd6e07a3423cc171b0677fea50274272b.tar.bz2 GT5-Unofficial-c5eeb27cd6e07a3423cc171b0677fea50274272b.zip | |
Fixing INTEGER.MAX_VALUE culprit....
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaBase_Item.java | 4 |
1 files changed, 2 insertions, 2 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 3889854893..c37512bd87 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -260,8 +260,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci if (tStats == null || tStats[2] > aTier || !(tStats[3] == -1 || tStats[3] == -3 || (tStats[3] < 0 && aCharge == Integer.MAX_VALUE)) || aStack.stackSize != 1) 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 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))); if (!aSimulate) setCharge(aStack, tNewCharge); return tNewCharge - tChargeBefore; } |