From 7ea12e97ecc1216fcdbdf7812dfdb25c7d56670e Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 22 Dec 2020 11:28:33 -0500 Subject: [PATCH] Fixed #4073 --- core/src/mindustry/entities/comp/FlyingComp.java | 4 ++-- .../world/blocks/defense/turrets/TractorBeamTurret.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java index abcb5e39cb..94db2f6a63 100644 --- a/core/src/mindustry/entities/comp/FlyingComp.java +++ b/core/src/mindustry/entities/comp/FlyingComp.java @@ -51,8 +51,8 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ } void moveAt(Vec2 vector, float acceleration){ - Vec2 t = tmp1.set(vector).scl(floorSpeedMultiplier()); //target vector - tmp2.set(t).sub(vel).limit(acceleration * vector.len() * Time.delta); //delta vector + Vec2 t = tmp1.set(vector); //target vector + tmp2.set(t).sub(vel).limit(acceleration * vector.len() * Time.delta * floorSpeedMultiplier()); //delta vector vel.add(tmp2); } diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index 511faf35ef..34e960ea2d 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -118,7 +118,7 @@ public class TractorBeamTurret extends BaseTurret{ } any = true; - target.impulseNet(Tmp.v1.set(this).sub(target).limit((force + (1f - target.dst(this) / range) * scaledForce) * efficiency() * timeScale)); + target.impulseNet(Tmp.v1.set(this).sub(target).limit((force + (1f - target.dst(this) / range) * scaledForce) * edelta() * timeScale)); } }else{ strength = Mathf.lerpDelta(strength, 0, 0.1f);