From a9b5949a7b1281447985345a2755ab18fee345ab Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 10 Jun 2018 14:46:04 -0400 Subject: [PATCH] Fixed units not shooting --- core/src/io/anuke/mindustry/entities/units/BaseUnit.java | 4 ++-- core/src/io/anuke/mindustry/entities/units/FlyingUnit.java | 2 +- core/src/io/anuke/mindustry/entities/units/GroundUnit.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 736e089357..14454a3b4f 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -87,8 +87,8 @@ public abstract class BaseUnit extends Unit{ } } - public void shoot(AmmoType type, float rotation, float translation){ - + public void shoot(AmmoType type, float rotation){ + CallEntity.onUnitShoot(this, type, rotation); } public void targetClosestAllyFlag(BlockFlag flag){ diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index e8e7840c78..0a5574302b 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -196,7 +196,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ AmmoType ammo = inventory.getAmmo(); inventory.useAmmo(); - shoot(ammo, Angles.moveToward(rotation, angleTo(target), maxAim), 4f); + shoot(ammo, Angles.moveToward(rotation, angleTo(target), maxAim)); } } } diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index f5ccfb4e67..87e10ba8bd 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -178,7 +178,7 @@ public abstract class GroundUnit extends BaseUnit { inventory.useAmmo(); rotate(angleTo(target)); - shoot(ammo, Angles.moveToward(rotation, angleTo(target), maxAim), 4f); + shoot(ammo, Angles.moveToward(rotation, angleTo(target), maxAim)); } }else{ moveToCore();