From 6e8ba927dd09b25aa0dcd1644e4f8a7f88d60856 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Mon, 6 Jan 2020 18:09:19 +0100 Subject: [PATCH] =?UTF-8?q?Final=20cleanup=20before=20the=20draft=20phase?= =?UTF-8?q?=20ends=20=E2=9D=A4=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../world/blocks/distribution/BaseConveyor.java | 9 +++++---- .../world/blocks/distribution/CraterConveyor.java | 1 + core/src/mindustry/world/meta/BlockStat.java | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/BaseConveyor.java b/core/src/mindustry/world/blocks/distribution/BaseConveyor.java index 22e812e129..149ed59188 100644 --- a/core/src/mindustry/world/blocks/distribution/BaseConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/BaseConveyor.java @@ -21,16 +21,17 @@ abstract public class BaseConveyor extends Block implements Autotiler{ public BaseConveyor(String name){ super(name); + rotate = true; update = true; - layer = Layer.overlay; - group = BlockGroup.transportation; hasItems = true; itemCapacity = 4; + unloadable = false; + layer = Layer.overlay; + idleSoundVolume = 0.004f; conveyorPlacement = true; idleSound = Sounds.conveyor; - idleSoundVolume = 0.004f; - unloadable = false; + group = BlockGroup.transportation; } @Override diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java index d73f578e0d..c2fb5ff5b0 100644 --- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java @@ -78,6 +78,7 @@ public class CraterConveyor extends BaseConveyor{ // draw crater Draw.rect(crater, Tmp.v1.x, Tmp.v1.y, rotation - 90); + // failsafe if(entity.dominant() == null) return; // draw resource diff --git a/core/src/mindustry/world/meta/BlockStat.java b/core/src/mindustry/world/meta/BlockStat.java index c6b4acb9a5..162df3dd37 100644 --- a/core/src/mindustry/world/meta/BlockStat.java +++ b/core/src/mindustry/world/meta/BlockStat.java @@ -26,7 +26,6 @@ public enum BlockStat{ input(StatCategory.crafting), output(StatCategory.crafting), - throughput(StatCategory.crafting), productionTime(StatCategory.crafting), drillTier(StatCategory.crafting), drillSpeed(StatCategory.crafting),