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(); } }); 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; } 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"] } ]