From f54116425d8ae6ded6abfa013ebcf38b35480a9d Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 11 May 2022 12:33:10 -0400 Subject: [PATCH] Bugfixes --- core/src/mindustry/world/blocks/production/SolidPump.java | 1 + core/src/mindustry/world/draw/DrawTurret.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java index 52d323ed3f..a08f781758 100644 --- a/core/src/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/mindustry/world/blocks/production/SolidPump.java @@ -119,6 +119,7 @@ public class SolidPump extends Pump{ @Override public void updateTile(){ + liquidDrop = result; float fraction = Math.max(validTiles + boost + (attribute == null ? 0 : attribute.env()), 0); if(efficiency > 0 && typeLiquid() < liquidCapacity - 0.001f){ diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java index d6f8172cbb..6679790935 100644 --- a/core/src/mindustry/world/draw/DrawTurret.java +++ b/core/src/mindustry/world/draw/DrawTurret.java @@ -117,7 +117,7 @@ public class DrawTurret extends DrawBlock{ } //TODO test this for mods, e.g. exotic - if(!base.found() && block.minfo.mod != null) base = Core.atlas.find(block.minfo.mod.name + "-block-" + block.size); + if(!base.found() && block.minfo.mod != null) base = Core.atlas.find(block.minfo.mod.name + "-" + basePrefix + "block-" + block.size); if(!base.found()) base = Core.atlas.find(basePrefix + "block-" + block.size); }