Merge remote-tracking branch 'origin/master'

core/src/mindustry/maps/SectorDamage.java

@@ -260,8 +260,8 @@ public class SectorDamage{
 
                         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.
-                            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)){
                                 Tile other = world.rawTile(wx, wy);
                                 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;
                                 }
                             }
                         }

desktop/build.gradle

@@ -51,7 +51,7 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
 }
 
 if(!project.ext.hasSprites()){
-    println "Scheduling sprite packi."
+    println "Scheduling sprite packing."
     run.dependsOn ":tools:pack"
     dist.dependsOn ":tools:pack"
 }