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

Potentially fixed targeting issues

Browse Source
This commit is contained in:
Anuken
2018-10-17 14:01:18 -04:00
parent 4614aacc02
commit 245dd39a60
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/Units.java
View File

@@ -143,7 +143,7 @@ public class Units{
/**Returns the closest target enemy. First, units are checked, then tile entities.*/ /**Returns the closest target enemy. First, units are checked, then tile entities.*/
public static TargetTrait getClosestTarget(Team team, float x, float y, float range){ public static TargetTrait getClosestTarget(Team team, float x, float y, float range){
return getClosestTarget(team, x, y, range, u -> true); return getClosestTarget(team, x, y, range, u -> !u.isDead() && u.isAdded());
} }
/**Returns the closest target enemy. First, units are checked, then tile entities.*/ /**Returns the closest target enemy. First, units are checked, then tile entities.*/

2
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -85,7 +85,7 @@ public class MobileInput extends InputHandler implements GestureListener{
/** Check and assign targets for a specific position. */ /** Check and assign targets for a specific position. */
void checkTargets(float x, float y){ void checkTargets(float x, float y){
synchronized(Entities.entityLock){ synchronized(Entities.entityLock){
Unit unit = Units.getClosestEnemy(player.getTeam(), x, y, 20f, u -> true); Unit unit = Units.getClosestEnemy(player.getTeam(), x, y, 20f, u -> !u.isDead() && u.isAdded());
if(unit != null){ if(unit != null){
threads.run(() -> player.target = unit); threads.run(() -> player.target = unit);