mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-06 02:40:23 -08:00
Code Issues Projects Releases Wiki Activity

Fixed commanded units attacking invalid targets

Browse source
This commit is contained in:
Anuken 2023-09-18 23:18:55 -04:00
parent 844894f584
commit 66ad4e1798
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/src/mindustry/input/InputHandler.java
View file

@ -225,6 +225,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
Teamc teamTarget = buildTarget == null ? unitTarget : buildTarget;
boolean anyCommandedTarget = false;
for(int id : unitIds){
Unit unit = Groups.unit.getByID(id);
@ -235,12 +236,15 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ai.command(UnitCommand.moveCommand);
}
if(teamTarget != null && teamTarget.team() != player.team()){
ai.commandTarget(teamTarget);
if(teamTarget != null && teamTarget.team() != player.team() &&
!(teamTarget instanceof Unit u && !unit.canTarget(u)) && !(teamTarget instanceof Building && !unit.type.targetGround)){
anyCommandedTarget = true;
ai.commandTarget(teamTarget);
}else if(posTarget != null){
ai.commandPosition(posTarget);
}
unit.lastCommanded = player.coloredName();
//remove when other player command
@ -251,7 +255,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
if(unitIds.length > 0 && player == Vars.player && !state.isPaused()){
if(teamTarget != null){
if(anyCommandedTarget){
Fx.attackCommand.at(teamTarget);
}else{
Fx.moveCommand.at(posTarget);