From 618a050414f66e9df757ea4fd2b92e53a4726531 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 14 Nov 2019 15:01:43 -0500 Subject: [PATCH] Fix getProgressIncrease --- core/src/io/anuke/mindustry/world/Block.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 45b7fcb61d..8e733dab1f 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -207,7 +207,8 @@ public class Block extends BlockStorage{ if(tile == null || tile.entity == null || tile.entity.power == null) return out; for(Tile other : tile.entity.proximity()){ - if(other != null && other.entity != null && other.entity.power != null && !(consumesPower && other.block().consumesPower && !outputsPower && !other.block().outputsPower) + if(other != null && other.entity != null && other.entity.power != null + && !(consumesPower && other.block().consumesPower && !outputsPower && !other.block().outputsPower) && !tile.entity.power.links.contains(other.pos())){ out.add(other); } @@ -221,11 +222,7 @@ public class Block extends BlockStorage{ } protected float getProgressIncrease(TileEntity entity, float baseTime){ - float progressIncrease = 1f / baseTime * entity.delta(); - if(hasPower){ - progressIncrease *= entity.power.status; // Reduced increase in case of low power - } - return progressIncrease; + return 1f / baseTime * entity.delta() * entity.efficiency(); } /** @return whether this block should play its active sound.*/