Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No shooting in the editor

Browse Source
This commit is contained in:
Anuken
2025-09-19 14:08:17 -04:00
parent e5fc44166d
commit cc4119a837
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/input/DesktopInput.java
View File

@@ -282,7 +282,7 @@ public class DesktopInput extends InputHandler{
} }
} }
shouldShoot = !scene.hasMouse() && !locked; shouldShoot = !scene.hasMouse() && !locked && !state.isEditor();
if(!locked && block == null && !scene.hasField() && !scene.hasDialog() && if(!locked && block == null && !scene.hasField() && !scene.hasDialog() &&
//disable command mode when player unit can boost and command mode binding is the same //disable command mode when player unit can boost and command mode binding is the same

4
core/src/mindustry/input/MobileInput.java
View File

@@ -540,7 +540,7 @@ public class MobileInput extends InputHandler implements GestureListener{
lastLineY = tileY; lastLineY = tileY;
}else if(!tryTapPlayer(worldx, worldy) && Core.settings.getBool("keyboard")){ }else if(!tryTapPlayer(worldx, worldy) && Core.settings.getBool("keyboard")){
//shoot on touch down when in keyboard mode //shoot on touch down when in keyboard mode
player.shooting = true; player.shooting = !state.isEditor();
} }
} }
@@ -1053,7 +1053,7 @@ public class MobileInput extends InputHandler implements GestureListener{
unit.movePref(movement); unit.movePref(movement);
//update shooting if not building + not mining //update shooting if not building + not mining
if(!unit.activelyBuilding() && unit.mineTile == null){ if(!unit.activelyBuilding() && unit.mineTile == null && !state.isEditor()){
//autofire targeting //autofire targeting
if(manualShooting){ if(manualShooting){