diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav index e4d10dad79..1f1500439b 100644 Binary files a/core/assets/maps/groundZero.msav and b/core/assets/maps/groundZero.msav differ 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){