From e66c95fc76b73dae2c50623f272012af17966297 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 2 Jul 2018 21:47:26 -0400 Subject: [PATCH] Fixed ground units not targeting things properly --- core/src/io/anuke/mindustry/entities/units/BaseUnit.java | 6 ------ core/src/io/anuke/mindustry/entities/units/GroundUnit.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 526ffbb718..3cf444c62f 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -114,22 +114,16 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } } public void targetClosestAllyFlag(BlockFlag flag){ - if(target != null) return; - Tile target = Geometry.findClosest(x, y, world.indexer().getAllied(team, flag)); if (target != null) this.target = target.entity; } public void targetClosestEnemyFlag(BlockFlag flag){ - if(target != null) return; - Tile target = Geometry.findClosest(x, y, world.indexer().getEnemy(team, flag)); if (target != null) this.target = target.entity; } public void targetClosest(){ - if(target != null) return; - target = Units.getClosestTarget(team, x, y, inventory.getAmmoRange()); } diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index ba3671d558..0ce352809f 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -219,7 +219,7 @@ public abstract class GroundUnit extends BaseUnit { TileEntity core = getClosestEnemyCore(); float dst = core == null ? 0 :distanceTo(core); - if(core != null && inventory.hasAmmo() && dst < inventory.getAmmo().getRange()){ + if(core != null && inventory.hasAmmo() && dst < inventory.getAmmo().getRange()/1.1f){ target = core; }else { retarget(() -> targetClosest());