diff options
| author | Prometheus0000 <prometheus0000000@gmail.com> | 2020-12-08 14:29:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-08 14:29:47 -0500 |
| commit | f7388b4c5e74b57b6d01bec1b9d36dada1a734f2 (patch) | |
| tree | 172ce7dff17bf8ad2fbf8d144bb4c428371c5a52 /src/main/java/gregtech/api | |
| parent | 3ea02985a752745280981021bba93323ae39cf2c (diff) | |
| parent | ec0489acfd984e3e29e9cf0a664dd5cfcca0581b (diff) | |
| download | GT5-Unofficial-f7388b4c5e74b57b6d01bec1b9d36dada1a734f2.tar.gz GT5-Unofficial-f7388b4c5e74b57b6d01bec1b9d36dada1a734f2.tar.bz2 GT5-Unofficial-f7388b4c5e74b57b6d01bec1b9d36dada1a734f2.zip | |
Merge pull request #14 from GTNewHorizons/experimental
update
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 4d264bec9b..5cfcac0a89 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -1685,7 +1685,7 @@ public class GT_ModHandler { int tTier = ((ic2.api.item.IElectricItem) aStack.getItem()).getTier(aStack); if (tTier < 0 || tTier == aTier || aTier == Integer.MAX_VALUE) { if (!aIgnoreLimit && tTier >= 0) - aCharge = (int) Math.min(aCharge, V[Math.max(0, Math.min(V.length - 1, tTier))]); + aCharge = (int) Math.min(aCharge, V[Math.max(0, Math.min(V.length - 1, tTier))] + B[Math.max(0, Math.min(V.length - 1, tTier))]); if (aCharge > 0) { // int rCharge = Math.max(0, ic2.api.item.ElectricItem.manager.discharge(aStack, aCharge + (aCharge * 4 > aTier ? aTier : 0), tTier, T, aSimulate)); int rCharge = (int) Math.max(0, ic2.api.item.ElectricItem.manager.discharge(aStack, aCharge + (aCharge * 4 > aTier ? aTier : 0), tTier, true, !aIgnoreDischargability, aSimulate)); |