aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorDavid Lindström <info@davidlindstrom.se>2020-12-05 02:14:43 +0100
committerDavid Lindström <info@davidlindstrom.se>2020-12-05 02:14:43 +0100
commit81008e38ac10436a7d447a20d8deac693e311bdf (patch)
tree178235718eebec1ec940b0f86551f729fc342cc7 /src/main/java
parenta0a77f0b9868a4ca8a3df8ae8d50b4dcfb4030db (diff)
downloadGT5-Unofficial-81008e38ac10436a7d447a20d8deac693e311bdf.tar.gz
GT5-Unofficial-81008e38ac10436a7d447a20d8deac693e311bdf.tar.bz2
GT5-Unofficial-81008e38ac10436a7d447a20d8deac693e311bdf.zip
This makes batteries drain/charge their tier loss extra charging their contained machines buffer
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java2
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));