aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbotn365 <42187820+botn365@users.noreply.github.com>2019-10-25 10:45:44 +0200
committerDaniel <daniel112092@gmail.com>2019-10-25 10:45:44 +0200
commit86c332050b0a28788d13f4a80852d9f325c30650 (patch)
tree5761a2dbf795aaec32caf36c9d521d7fb182e3cf
parent14ea6a3ba9de16dd6fbd731b7b0f80ed109d4541 (diff)
downloadGT5-Unofficial-86c332050b0a28788d13f4a80852d9f325c30650.tar.gz
GT5-Unofficial-86c332050b0a28788d13f4a80852d9f325c30650.tar.bz2
GT5-Unofficial-86c332050b0a28788d13f4a80852d9f325c30650.zip
fix bufferd dynamo hatch (#207)
* fix buffer dynamo hatch fix where a turbine with a buffer dynamo hatch makes more then 1A it wil not out put non complete amps in to the buffer * Update GT_MetaTileEntity_MultiBlockBase.java * Update GT_MetaTileEntity_MultiBlockBase.java
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 2da97a1939..221330e6df 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -566,7 +566,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
//Isnt too low EUt check?
int aAmpsToInject;
int aRemainder;
-
+ int ampsOnCurrentHatch;
//xEUt *= 4;//this is effect of everclocking
for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : mDynamoHatches) {
if (isValidMetaTileEntity(aDynamo)) {
@@ -574,11 +574,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
aVoltage = aDynamo.maxEUOutput();
aAmpsToInject = (int) (leftToInject / aVoltage);
aRemainder = (int) (leftToInject - (aAmpsToInject * aVoltage));
- long powerGain;
- for (int i = 0; i < Math.min(aDynamo.maxAmperesOut(), aAmpsToInject > 0 ? aAmpsToInject : 1); i++) {
- powerGain = aAmpsToInject > 0 ? aVoltage : aRemainder;
- aDynamo.getBaseMetaTileEntity().increaseStoredEnergyUnits(powerGain, false);
- injected += powerGain;
+ ampsOnCurrentHatch=Math.min(aDynamo.maxAmperesOut(), aAmpsToInject);
+ for (int i = 0; i < ampsOnCurrentHatch; i++) {
+ aDynamo.getBaseMetaTileEntity().increaseStoredEnergyUnits(aVoltage, false);
+ }
+ injected+=aVoltage*ampsOnCurrentHatch;
+ if(aRemainder>0 && ampsOnCurrentHatch<aDynamo.maxAmperesOut()){
+ aDynamo.getBaseMetaTileEntity().increaseStoredEnergyUnits(aRemainder, false);
+ injected+=aRemainder;
}
}
}