From a78c0defc77f41fff883babc35b74a0062231604 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 31 Dec 2019 10:29:18 -0500 Subject: [PATCH] Fixed #1289 --- core/src/mindustry/core/Logic.java | 4 ++-- server/src/mindustry/server/ServerControl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index e7c84adbc8..7d5419a912 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -47,8 +47,8 @@ public class Logic implements ApplicationListener{ //blocks that get broken are appended to the team's broken block queue Tile tile = event.tile; Block block = tile.block(); - //skip null entities or nukes, for obvious reasons - if(tile.entity == null || tile.block() instanceof NuclearReactor) return; + //skip null entities or nukes, for obvious reasons; also skip client since they can't modify these requests + if(tile.entity == null || tile.block() instanceof NuclearReactor || net.client()) return; if(block instanceof BuildBlock){ diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index f78f6fbab9..8d2feb74b0 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -190,7 +190,7 @@ public class ServerControl implements ApplicationListener{ }); handler.register("version", "Displays server version info.", arg -> { - info("&lmVersion: &lyMindustry {0}-{1} {2} / build {3}", Version.number, Version.modifier, Version.type, Version.build); + info("&lmVersion: &lyMindustry {0}-{1} {2} / build {3}", Version.number, Version.modifier, Version.type, Version.build + (Version.revision == 0 ? "" : "." + Version.revision)); info("&lmJava Version: &ly{0}", System.getProperty("java.version")); });