From 50c6b0b1bdbf6c06fb4055ca4876d521e5f1c4c9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 27 Mar 2020 10:07:42 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/world/blocks/power/PowerGraph.java | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 40a7ceb106..5f12268e7b 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -198,6 +198,8 @@ public class PowerGraph{ lastPowerNeeded = powerNeeded; lastPowerProduced = powerProduced; + powerBalance.addValue((lastPowerProduced - lastPowerNeeded) / Time.delta()); + if(!(consumers.size == 0 && producers.size == 0 && batteries.size == 0)){ if(!Mathf.equal(powerNeeded, powerProduced)){ @@ -213,8 +215,6 @@ public class PowerGraph{ distributePower(powerNeeded, powerProduced); } - powerBalance.addValue((lastPowerProduced - lastPowerNeeded) / Time.delta()); - //overproducing: 10 / 20 = 0.5 //underproducing: 20 / 10 = 2 -> clamp -> 1.0 //nothing being produced: 20 / 0 -> 1.0 diff --git a/gradle.properties b/gradle.properties index 32a3974fb7..0f5f52d1e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=670ff2275995a11566a81a9cdaeb1468e7cf2042 +archash=04b670f22169ae9e268458950a5d324b5ed03e23