From 6df70abad6e202c72147e2c77c47b506957d6fce Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sat, 3 Jul 2021 19:14:27 +0200 Subject: nake rest rf actualy work --- .../gregtech/api/graphs/consumers/NodeEnergyReceiver.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/gregtech/api/graphs') diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java index 83edf2d432..099c7617f0 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 aMaxApms) { 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 && -- cgit From baaa4e496e21b6e5afac9452363756b87c3c2f0a Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sat, 3 Jul 2021 19:17:46 +0200 Subject: prevent crach in case getBase is null --- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/graphs') diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 1445e45734..1a53361b6c 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(); } } } -- cgit From 0eac82f5fbd406f60b0bc253b3b8960446441f63 Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sat, 3 Jul 2021 19:19:20 +0200 Subject: fix extra { --- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/graphs') diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 1a53361b6c..1120fe84e4 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -52,7 +52,7 @@ public class PowerNodePath extends NodePath { for (MetaPipeEntity tCable : mPipes) { if (((GT_MetaPipeEntity_Cable)tCable).mAmperage*40 < this.mAmps) { BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity(); - if (tBaseCable != null) { + if (tBaseCable != null) tBaseCable.setToFire(); } } -- cgit