aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-07-02 20:52:49 +0200
committerGitHub <noreply@github.com>2021-07-02 20:52:49 +0200
commit2a5b42343509d9684affa6be27da32e9eef89851 (patch)
treec1542a71bf37ed7611aa4cecb6d633556798d01d /src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
parent77c57a97b7286863f9239de806ac9659013d6852 (diff)
parent6f80c03736d6d9ea9c72d19f0af72fc727714370 (diff)
downloadGT5-Unofficial-2a5b42343509d9684affa6be27da32e9eef89851.tar.gz
GT5-Unofficial-2a5b42343509d9684affa6be27da32e9eef89851.tar.bz2
GT5-Unofficial-2a5b42343509d9684affa6be27da32e9eef89851.zip
Merge pull request #572 from GTNewHorizons/beter-power-net
Better power net
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java')
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index 158b53068d..24d0576864 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -61,7 +61,7 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
*/
public static final long emitEnergyToNetwork(long aVoltage, long aAmperage, IEnergyConnected aEmitter) {
long rUsedAmperes = 0;
- for (byte i = 0, j = 0; i < 6 && aAmperage > rUsedAmperes; i++)
+ for (byte i = 0, j = 0; i < 6 && aAmperage > rUsedAmperes; i++) {
if (aEmitter.outputsEnergyTo(i)) {
j = GT_Utility.getOppositeSide(i);
TileEntity tTileEntity = aEmitter.getTileEntityAtSide(i);
@@ -71,6 +71,7 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
if (tColor >= 0 && tColor != aEmitter.getColorization()) continue;
}
rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes);
+
} else if (tTileEntity instanceof IEnergySink) {
if (((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) {
while (aAmperage > rUsedAmperes && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink) tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage) < aVoltage)
@@ -124,6 +125,7 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
}
}
}
+ }
return rUsedAmperes;
}
}