diff options
| author | Martin Robertz <dream-master@gmx.net> | 2020-12-05 08:33:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 08:33:16 +0100 |
| commit | 01f38e550cc2173a29feb5c68f9e64f4aaa9a63e (patch) | |
| tree | 178235718eebec1ec940b0f86551f729fc342cc7 /src/main/java/gregtech/api/util/GT_ModHandler.java | |
| parent | a0a77f0b9868a4ca8a3df8ae8d50b4dcfb4030db (diff) | |
| parent | 81008e38ac10436a7d447a20d8deac693e311bdf (diff) | |
| download | GT5-Unofficial-01f38e550cc2173a29feb5c68f9e64f4aaa9a63e.tar.gz GT5-Unofficial-01f38e550cc2173a29feb5c68f9e64f4aaa9a63e.tar.bz2 GT5-Unofficial-01f38e550cc2173a29feb5c68f9e64f4aaa9a63e.zip | |
Merge pull request #362 from dvdmandt/experimental
This makes batteries drain/charge their tier loss extra …
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_ModHandler.java')
| -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)); |