From 8b17972b119e943a4791ade57bb4894cc51558a8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 27 Jun 2018 11:04:56 -0400 Subject: [PATCH] Fixed buggy ground unit rotations --- .../mindustry/entities/units/GroundUnit.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index e44297fe22..eba35daf8b 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -233,21 +233,22 @@ public abstract class GroundUnit extends BaseUnit { moveToCore(); } - rotate(angleTo(target)); - }else{ moveToCore(); - rotate(angleTo(target)); } - if (Mathf.angNear(angleTo(target), rotation, 13f) && distanceTo(target) < inventory.getAmmo().getRange()) { - AmmoType ammo = inventory.getAmmo(); + if(distanceTo(target) < inventory.getAmmo().getRange()){ rotate(angleTo(target)); - Vector2 to = Predict.intercept(GroundUnit.this, target, ammo.bullet.speed); + if (Mathf.angNear(angleTo(target), rotation, 13f)) { + AmmoType ammo = inventory.getAmmo(); - getWeapon().update(GroundUnit.this, to.x, to.y); + Vector2 to = Predict.intercept(GroundUnit.this, target, ammo.bullet.speed); + + getWeapon().update(GroundUnit.this, to.x, to.y); + } } + }else{ moveToCore(); }