From 36b49b6d8b69c26ce7ffc5905e747dd5ab197261 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 27 Jun 2021 09:11:49 -0400 Subject: [PATCH] Fixed #5488 / Fixed #5489 --- core/src/mindustry/entities/comp/BoundedComp.java | 3 ++- core/src/mindustry/world/blocks/production/Fracker.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/BoundedComp.java b/core/src/mindustry/entities/comp/BoundedComp.java index 6ecb94052f..7b09f23f69 100644 --- a/core/src/mindustry/entities/comp/BoundedComp.java +++ b/core/src/mindustry/entities/comp/BoundedComp.java @@ -1,6 +1,7 @@ package mindustry.entities.comp; import arc.math.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; @@ -24,7 +25,7 @@ abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{ if(x > world.unitWidth()) dx -= (x - world.unitWidth())/warpDst; if(y > world.unitHeight()) dy -= (y - world.unitHeight())/warpDst; - velAddNet(dx, dy); + velAddNet(dx * Time.delta, dy * Time.delta); } //clamp position if not flying diff --git a/core/src/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java index a3dc07b312..fc07b9750a 100644 --- a/core/src/mindustry/world/blocks/production/Fracker.java +++ b/core/src/mindustry/world/blocks/production/Fracker.java @@ -1,6 +1,7 @@ package mindustry.world.blocks.production; import arc.graphics.g2d.*; +import arc.math.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; import mindustry.graphics.*; @@ -67,6 +68,8 @@ public class Fracker extends SolidPump{ super.updateTile(); accumulator += delta() * efficiency(); }else{ + warmup = Mathf.lerpDelta(warmup, 0f, 0.02f); + lastPump = 0f; dumpLiquid(result); } }