From 1d57568322cbf7d1bb0a84215949b50ffd907f4d Mon Sep 17 00:00:00 2001 From: Timmeey86 Date: Thu, 29 Nov 2018 23:35:56 +0100 Subject: [PATCH] All power distributors now update power graph Replaced manual power graph update by base implementation call so future changes in base class get applied to all subclasses automatically. Added the call where missing. --- .../io/anuke/mindustry/world/blocks/power/FusionReactor.java | 2 +- .../io/anuke/mindustry/world/blocks/power/ItemGenerator.java | 2 ++ .../anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java | 2 ++ .../io/anuke/mindustry/world/blocks/power/LiquidGenerator.java | 2 +- .../io/anuke/mindustry/world/blocks/power/NuclearReactor.java | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java index 0194cfb81d..047825375c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java @@ -44,7 +44,7 @@ public class FusionReactor extends PowerGenerator{ float efficiencyAdded = Mathf.pow(entity.warmup, 4f) * Timers.delta(); entity.productionEfficiency = Mathf.clamp(entity.productionEfficiency + efficiencyAdded * increaseOrDecrease); - tile.entity.power.graph.update(); + super.update(tile); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java index a8d8da9699..3a16d3df04 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java @@ -93,6 +93,8 @@ public abstract class ItemGenerator extends PowerGenerator{ Effects.effect(explodeEffect, tile.worldx() + Mathf.range(size * tilesize / 2f), tile.worldy() + Mathf.range(size * tilesize / 2f)); } } + + super.update(tile); } protected abstract float getItemEfficiency(Item item); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java index c41f8d1c39..974ade4db5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -89,6 +89,8 @@ public abstract class ItemLiquidGenerator extends ItemGenerator{ entity.productionEfficiency = 0.0f; } } + + super.update(tile); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java index 7314c56a0d..fd909bae76 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java @@ -66,7 +66,7 @@ public abstract class LiquidGenerator extends PowerGenerator{ } } - tile.entity.power.graph.update(); + super.update(tile); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index 2edeaa6f09..f2abdbc304 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -128,7 +128,7 @@ public class NuclearReactor extends PowerGenerator{ if(entity.heat >= 0.999f){ entity.kill(); }else{ - tile.entity.power.graph.update(); + super.update(tile); } }