diff --git a/core/assets-raw/sprites/blocks/turrets/hail-heat.png b/core/assets-raw/sprites/blocks/turrets/hail-heat.png index ef3805e18e..84f197b52b 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/hail-heat.png and b/core/assets-raw/sprites/blocks/turrets/hail-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png index aa7a70ac87..604fb5d5de 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/hail.png differ diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java index a10863bbe4..94a0de3071 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java @@ -250,6 +250,8 @@ public class PayloadConveyor extends Block{ @Override public void unitOn(Unit unit){ + if(!enabled) return; + //calculate derivative of units moved last frame float delta = (curInterp - lastInterp) * size * tilesize; Tmp.v1.trns(rotdeg(), delta * moveForce).scl(1f / Math.max(unit.mass(), 201f));