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

fix health calculation in background sectors (#4011)

Browse Source
This commit is contained in:
rMuchan
2020-12-17 10:09:28 -05:00
committed by GitHub
parent b8efed9eaf
commit 9a777f3ce5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/maps/SectorDamage.java
+3 -3
View File
@@ -260,8 +260,8 @@ public class SectorDamage{
if(tile.build != null && tile.team() == state.rules.defaultTeam && counted.add(tile.pos())){ if(tile.build != null && tile.team() == state.rules.defaultTeam && counted.add(tile.pos())){
//health is divided by block size, because multiblocks are counted multiple times. //health is divided by block size, because multiblocks are counted multiple times.
sumHealth += tile.build.health / tile.block().size; sumHealth += tile.build.health / (tile.block().size * tile.block().size);
totalPathBuild += 1f / tile.block().size; totalPathBuild += 1f / (tile.block().size * tile.block().size);
} }
} }
} }
@@ -409,7 +409,7 @@ public class SectorDamage{
if(wx >= 0 && wy >= 0 && wx < world.width() && wy < world.height() && Mathf.within(dx, dy, radius)){ if(wx >= 0 && wy >= 0 && wx < world.width() && wy < world.height() && Mathf.within(dx, dy, radius)){
Tile other = world.rawTile(wx, wy); Tile other = world.rawTile(wx, wy);
if(!(other.block() instanceof CoreBlock)){ if(!(other.block() instanceof CoreBlock)){
s += other.team() == state.rules.defaultTeam ? other.build.health / other.block().size : 0f; s += other.team() == state.rules.defaultTeam ? other.build.health / (other.block().size * other.block().size) : 0f;
} }
} }
} }