From 01c243ee9f58c3f64fc883f931ad9a81813f894f Mon Sep 17 00:00:00 2001 From: Sphyix Date: Thu, 16 Sep 2021 22:49:29 +0200 Subject: fix int overflow on amps calculation --- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 1 + 1 file changed, 1 insertion(+) (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 df6f2671e4..0baa642406 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -98,6 +98,7 @@ public class PowerNodePath extends NodePath { private void reset(int aTimePassed) { if (aTimePassed < 0 || aTimePassed > 100) { mAmps = 0; + return; } mAmps = Math.max(0, mAmps - (mMaxAmps * aTimePassed)); } -- cgit From 8b9f24202072698748cad0b5f6d0b6c9f9ce2a42 Mon Sep 17 00:00:00 2001 From: Sphyix Date: Sun, 21 Nov 2021 12:59:24 +0100 Subject: Revert "fix int overflow on amps calculation" This reverts commit 01c243ee9f58c3f64fc883f931ad9a81813f894f. --- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 1 - 1 file changed, 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 0baa642406..df6f2671e4 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -98,7 +98,6 @@ public class PowerNodePath extends NodePath { private void reset(int aTimePassed) { if (aTimePassed < 0 || aTimePassed > 100) { mAmps = 0; - return; } mAmps = Math.max(0, mAmps - (mMaxAmps * aTimePassed)); } -- cgit From 4d6dd17d60bc1e892fa8d2ca3bd562fb05049558 Mon Sep 17 00:00:00 2001 From: boubou_19 Date: Tue, 23 Nov 2021 23:25:14 +0100 Subject: centralized pollution for GT multies --- src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.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/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java index a24c4acbcd..e1f3c3f0e0 100644 --- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java +++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java @@ -73,7 +73,7 @@ public class NodeEnergyReceiver extends ConsumerNode { tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) if (GT_Mod.gregtechproxy.mPollution) - GT_Pollution.addPollution(tWorld.getChunkFromBlockCoords(tX, tZ), 100000); + GT_Pollution.addPollution(tWorld.getChunkFromBlockCoords(tX, tZ), GT_Mod.gregtechproxy.mPollutionOnExplosion); new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder() .setStrength(tStrength) -- cgit