From 245dd39a60af2579aa6d997183edbeb007a4b08f Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 17 Oct 2018 14:01:18 -0400 Subject: [PATCH] Potentially fixed targeting issues --- core/src/io/anuke/mindustry/entities/Units.java | 2 +- core/src/io/anuke/mindustry/input/MobileInput.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java index 5d5eee141c..04b661358b 100644 --- a/core/src/io/anuke/mindustry/entities/Units.java +++ b/core/src/io/anuke/mindustry/entities/Units.java @@ -143,7 +143,7 @@ public class Units{ /**Returns the closest target enemy. First, units are checked, then tile entities.*/ 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.*/ diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index d9f83cdd22..e95d76cdec 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -85,7 +85,7 @@ public class MobileInput extends InputHandler implements GestureListener{ /** Check and assign targets for a specific position. */ void checkTargets(float x, float y){ 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){ threads.run(() -> player.target = unit);