Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

core/src/mindustry/ai/types/BuilderAI.java

@@ -68,7 +68,7 @@ public class BuilderAI extends AIController{
             //approach request if building
             BuildPlan req = unit.buildPlan();
 
-            //clear break plan if another player is breaking something.
+            //clear break plan if another player is breaking something
             if(!req.breaking && timer.get(timerTarget2, 40f)){
                 for(Player player : Groups.player){
                     if(player.isBuilder() && player.unit().activelyBuilding() && player.unit().buildPlan().samePos(req) && player.unit().buildPlan().breaking){
@@ -131,16 +131,15 @@ public class BuilderAI extends AIController{
                 //check if it's already been placed
                 if(world.tile(block.x, block.y) != null && world.tile(block.x, block.y).block().id == block.block){
                     blocks.removeFirst();
-                }else if(Build.validPlace(content.block(block.block), unit.team(), block.x, block.y, block.rotation)){ //it's valid.
+                }else if(Build.validPlace(content.block(block.block), unit.team(), block.x, block.y, block.rotation)){ //it's valid
                     lastPlan = block;
-                    //add build request.
+                    //add build request
                     unit.addBuild(new BuildPlan(block.x, block.y, block.rotation, content.block(block.block), block.config));
-                    //shift build plan to tail so next unit builds something else.
+                    //shift build plan to tail so next unit builds something else
                     blocks.addLast(blocks.removeFirst());
                 }else{
                     //shift head of queue to tail, try something else next time
-                    blocks.removeFirst();
-                    blocks.addLast(block);
+                    blocks.addLast(blocks.removeFirst());
                 }
             }
         }

core/src/mindustry/content/Blocks.java

@@ -250,10 +250,7 @@ public class Blocks implements ContentList{
             canShadow = false;
         }};
 
-        empty = new EmptyFloor("empty"){{
-            placeableOn = false;
-            solid = true;
-        }};
+        empty = new EmptyFloor("empty");
 
         stone = new Floor("stone");
 

core/src/mindustry/entities/comp/PlayerComp.java

@@ -38,11 +38,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
     boolean admin;
     String name = "frog";
     Color color = new Color();
-    //locale should not be synced.
     transient String locale = "en";
     transient float deathTimer;
     transient String lastText = "";
     transient float textFadeTime;
+
     transient private Unit lastReadUnit = Nulls.unit;
     transient private int wrongReadUnits;
     transient @Nullable Unit justSwitchFrom, justSwitchTo;

core/src/mindustry/world/blocks/environment/EmptyFloor.java

@@ -3,12 +3,15 @@ package mindustry.world.blocks.environment;
 import mindustry.content.*;
 import mindustry.world.*;
 
+/** Empty floor is *not* equivalent to air. Unlike air, it is solid, and still draws neighboring tile edges. */
 public class EmptyFloor extends Floor{
 
     public EmptyFloor(String name){
         super(name);
         variants = 0;
         canShadow = false;
+        placeableOn = false;
+        solid = true;
     }
 
     @Override