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 1/3] 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; } From 52238e3aa48352ebb0ad8116247f8e68f9f29f3e Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 18 Oct 2021 21:57:05 -0400 Subject: [PATCH 2/3] Remove redundant cast (#6193) * Remove redundant cast * dumb --- core/src/mindustry/service/GameService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/service/GameService.java b/core/src/mindustry/service/GameService.java index a3890b6fc6..76c647c250 100644 --- a/core/src/mindustry/service/GameService.java +++ b/core/src/mindustry/service/GameService.java @@ -176,7 +176,7 @@ public class GameService{ }); Events.on(UnitControlEvent.class, e -> { - if(e.unit instanceof BlockUnitc && ((BlockUnitc)e.unit).tile().block == Blocks.router){ + if(e.unit instanceof BlockUnitc unit && unit.tile().block == Blocks.router){ becomeRouter.complete(); } }); From 038d132da995c65fdc9b3d41b06944945df3ba4a Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 19 Oct 2021 01:13:58 -0300 Subject: [PATCH 3/3] Update servers_v7.json (#6183) Add brazillian V7 servers --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 321a7a11bf..4ee885dabd 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -62,5 +62,9 @@ { "name": "Pandorum", "address": ["pandorum.su:5018", "pandorum.su:5019", "pandorum.su:5020"] + }, + { + "name": "MindustryBR", + "address": ["mindustry.me:4451", "n2.mindustry.me:4446"] } ]