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

core/src/mindustry/world/blocks/defense/ForceProjector.java

@@ -122,6 +122,12 @@ public class ForceProjector extends Block{
             super.onRemoved();
         }
 
+        @Override
+        public void pickedUp(){
+            super.pickedUp();
+            radscl = warmup = 0f;
+        }
+
         @Override
         public void updateTile(){
             boolean phaseValid = consumes.get(ConsumeType.item).valid(this);

core/src/mindustry/world/blocks/payloads/BuildPayload.java

@@ -91,10 +91,11 @@ public class BuildPayload implements Payload{
     public void draw(){
         drawShadow(1f);
         float prevZ = Draw.z();
-        Draw.zTransform(z -> 0.0011f + Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f));
+        Draw.zTransform(z -> z >= Layer.flyingUnitLow ? z : 0.0011f + Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f));
         build.tile = emptyTile;
         build.payloadDraw();
         Draw.zTransform();
+        Draw.z(prevZ);
     }
 
     @Override