diff options
| author | boubou19 <miisterunknown@gmail.com> | 2021-07-03 19:27:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 19:27:32 +0200 |
| commit | cdbf86aed8df06aa52ebd3477ded968855a16395 (patch) | |
| tree | 336b51eb93d712d6b5d7ae08a290daf4b25d97cd /src/main/java/gregtech/api/graphs | |
| parent | d5ff8e7cdaaa7f2bb1bf644addd4882401f41ff0 (diff) | |
| parent | 0eac82f5fbd406f60b0bc253b3b8960446441f63 (diff) | |
| download | GT5-Unofficial-cdbf86aed8df06aa52ebd3477ded968855a16395.tar.gz GT5-Unofficial-cdbf86aed8df06aa52ebd3477ded968855a16395.tar.bz2 GT5-Unofficial-cdbf86aed8df06aa52ebd3477ded968855a16395.zip | |
Merge pull request #587 from GTNewHorizons/beter-power-net
Beter power net
Diffstat (limited to 'src/main/java/gregtech/api/graphs')
| -rw-r--r-- | src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java index 9bd00d9e28..a24c4acbcd 100644 --- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java +++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java @@ -26,14 +26,14 @@ public class NodeEnergyReceiver extends ConsumerNode { public int injectEnergy(int aVoltage, int aMaxAmps) { ForgeDirection tDirection = ForgeDirection.getOrientation(mSide); int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100); - int ampsUsed = 1; - if (mRestRF > rfOut) { - rfOut = mRestRF; - ampsUsed = 0; + int ampsUsed = 0; + if (mRestRF < rfOut) { + mRestRF += rfOut; + ampsUsed = 1; } - if (((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, rfOut, true) > 0) { - int consumed = ((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, rfOut, false); - mRestRF = rfOut - consumed; + if (((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, mRestRF, true) > 0) { + int consumed = ((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, mRestRF, false); + mRestRF -= consumed; return ampsUsed; } if (GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions && diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 736373a9ca..a91f9b10a8 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -52,7 +52,8 @@ public class PowerNodePath extends NodePath { for (MetaPipeEntity tCable : mPipes) { if (((GT_MetaPipeEntity_Cable)tCable).mAmperage*40 < this.mAmps) { BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity(); - tBaseCable.setToFire(); + if (tBaseCable != null) + tBaseCable.setToFire(); } } } |