From 40edbe785c9cb1e7279d2a28236fef5203f0f963 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 30 Jul 2020 20:07:49 -0400 Subject: [PATCH] More bugfixes --- core/assets/maps/groundZero.msav | Bin 13544 -> 13543 bytes core/src/mindustry/entities/Predict.java | 1 - .../mindustry/entities/comp/HitboxComp.java | 16 +++++----------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav index e4d10dad799ce8c3a49f47f274882d1b9ee7c021..1f1500439bf1732aa754677c582a035ba7203194 100644 GIT binary patch literal 13543 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 YAFzKG_qOBzfB)Z*^|PMgh2;xn0IxAWlK=n! diff --git a/core/src/mindustry/entities/Predict.java b/core/src/mindustry/entities/Predict.java index fb31bf5ea6..03c41e5778 100644 --- a/core/src/mindustry/entities/Predict.java +++ b/core/src/mindustry/entities/Predict.java @@ -57,7 +57,6 @@ public class Predict{ ddx += ((Hitboxc)dst).deltaX(); ddy += ((Hitboxc)dst).deltaY(); } - Log.info("attach dst = @, @ @", dst, ddx, ddy); if(src instanceof Hitboxc){ ddx -= ((Hitboxc)src).deltaX()/(Time.delta); ddy -= ((Hitboxc)src).deltaY()/(Time.delta); diff --git a/core/src/mindustry/entities/comp/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java index 29b458c429..f92948af41 100644 --- a/core/src/mindustry/entities/comp/HitboxComp.java +++ b/core/src/mindustry/entities/comp/HitboxComp.java @@ -11,7 +11,7 @@ import mindustry.gen.*; abstract class HitboxComp implements Posc, QuadTreeObject{ @Import float x, y; - transient float lastX, lastY, hitSize; + transient float lastX, lastY, deltaX, deltaY, hitSize; @Override public void update(){ @@ -33,6 +33,8 @@ abstract class HitboxComp implements Posc, QuadTreeObject{ } void updateLastPosition(){ + deltaX = x - lastX; + deltaY = y - lastY; lastX = x; lastY = y; } @@ -41,20 +43,12 @@ abstract class HitboxComp implements Posc, QuadTreeObject{ } - float deltaX(){ - return x - lastX; - } - - float deltaY(){ - return y - lastY; - } - float deltaLen(){ - return Mathf.len(deltaX(), deltaY()); + return Mathf.len(deltaX, deltaY); } float deltaAngle(){ - return Mathf.angle(deltaX(), deltaY()); + return Mathf.angle(deltaX, deltaY); } boolean collides(Hitboxc other){