Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getProgressIncrease

Browse Source
This commit is contained in:
Anuken
2019-11-14 15:01:43 -05:00
parent ec7f49c94b
commit 618a050414
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/io/anuke/mindustry/world/Block.java
View File

@@ -207,7 +207,8 @@ public class Block extends BlockStorage{
if(tile == null || tile.entity == null || tile.entity.power == null) return out; if(tile == null || tile.entity == null || tile.entity.power == null) return out;
for(Tile other : tile.entity.proximity()){ 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())){ && !tile.entity.power.links.contains(other.pos())){
out.add(other); out.add(other);
} }
@@ -221,11 +222,7 @@ public class Block extends BlockStorage{
} }
protected float getProgressIncrease(TileEntity entity, float baseTime){ protected float getProgressIncrease(TileEntity entity, float baseTime){
float progressIncrease = 1f / baseTime * entity.delta(); return 1f / baseTime * entity.delta() * entity.efficiency();
if(hasPower){
progressIncrease *= entity.power.status; // Reduced increase in case of low power
}
return progressIncrease;
} }
/** @return whether this block should play its active sound.*/ /** @return whether this block should play its active sound.*/