Merge branches 'master' and 'new-map-format' of https://github.com/Anuken/Mindustry

core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java

@@ -252,10 +252,10 @@ public interface BuilderTrait extends Entity, TeamTrait{
         TileEntity core = unit.getClosestCore();
 
         if(core == null || tile.block() != Blocks.air || dst(tile.worldx(), tile.worldy()) > mineDistance
-                || tile.floor().itemDrop == null || !unit.acceptsItem(tile.floor().itemDrop) || !canMine(tile.floor().itemDrop)){
+                || tile.drop() == null || !unit.acceptsItem(tile.drop()) || !canMine(tile.drop())){
             setMineTile(null);
         }else{
-            Item item = tile.floor().itemDrop;
+            Item item = tile.drop();
             unit.rotation = Mathf.slerpDelta(unit.rotation, unit.angleTo(tile.worldx(), tile.worldy()), 0.4f);
 
             if(Mathf.chance(Time.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){

core/src/io/anuke/mindustry/entities/type/TileEntity.java

@@ -269,7 +269,6 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
         //TODO better smoke effect, this one is awful
         if(health != 0 && health < tile.block().health && !(tile.block() instanceof Wall) &&
                 Mathf.chance(0.009f * Time.delta() * (1f - health / tile.block().health))){
-
             Effects.effect(Fx.smoke, x + Mathf.range(4), y + Mathf.range(4));
         }