Merge remote-tracking branch 'origin/master'

core/src/mindustry/logic/LExecutor.java

@@ -1292,7 +1292,7 @@ public class LExecutor{
                         if(b instanceof Floor f && tile.floor() != f && !f.isOverlay()) tile.setFloorNet(f);
                     }
                     case block -> {
-                        if(!b.isFloor()){
+                        if(!b.isFloor() || b == Blocks.air){
                             Team t = exec.team(team);
                             if(t == null) t = Team.derelict;
 

core/src/mindustry/world/blocks/logic/SwitchBlock.java

@@ -1,5 +1,6 @@
 package mindustry.world.blocks.logic;
 
+import arc.audio.*;
 import arc.graphics.g2d.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
@@ -8,6 +9,8 @@ import mindustry.world.*;
 import mindustry.world.meta.*;
 
 public class SwitchBlock extends Block{
+    public Sound clickSound = Sounds.click;
+
     public @Load("@-on") TextureRegion onRegion;
 
     public SwitchBlock(String name){
@@ -27,7 +30,7 @@ public class SwitchBlock extends Block{
         @Override
         public boolean configTapped(){
             configure(!enabled);
-            Sounds.click.at(this);
+            clickSound.at(this);
             return false;
         }