From f2ce32cbb27f568134a5cd0b0830ce59cd938db3 Mon Sep 17 00:00:00 2001 From: MrDuck557 <48808663+MrDuck557@users.noreply.github.com> Date: Mon, 18 Oct 2021 20:17:57 -0400 Subject: [PATCH] LogicDisable (#6191) * LogicDisable * I have read CONTRIBUTING.md I forgot one space Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com> --- core/src/mindustry/world/meta/BlockStatus.java | 3 ++- core/src/mindustry/world/modules/ConsumeModule.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/meta/BlockStatus.java b/core/src/mindustry/world/meta/BlockStatus.java index fa939ec8c7..d21887244e 100644 --- a/core/src/mindustry/world/meta/BlockStatus.java +++ b/core/src/mindustry/world/meta/BlockStatus.java @@ -6,7 +6,8 @@ import mindustry.graphics.*; public enum BlockStatus{ active(Color.valueOf("5ce677")), noOutput(Color.orange), - noInput(Pal.remove); + noInput(Pal.remove), + logicDisable(Color.valueOf("8a73c6")); public final Color color; diff --git a/core/src/mindustry/world/modules/ConsumeModule.java b/core/src/mindustry/world/modules/ConsumeModule.java index 4714903c5d..4973f4151f 100644 --- a/core/src/mindustry/world/modules/ConsumeModule.java +++ b/core/src/mindustry/world/modules/ConsumeModule.java @@ -14,6 +14,10 @@ public class ConsumeModule extends BlockModule{ } public BlockStatus status(){ + if(entity.enabledControlTime > 0 && !entity.enabled){ + return BlockStatus.logicDisable; + } + if(!entity.shouldConsume()){ return BlockStatus.noOutput; }