Merge remote-tracking branch 'anuken/master' into crater

2019-12-31 18:55:06 +01:00
parent 7726d94566 42e0238bb9
commit 9c1eca6d31
2 changed files with 3 additions and 3 deletions
--- 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){