From fef8ee925ba2003f620c0883a95e56581d5a6ae4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 28 Jul 2021 11:51:20 -0400 Subject: [PATCH] Potential fix for #5660 --- core/src/mindustry/content/Blocks.java | 4 ++-- core/src/mindustry/input/InputHandler.java | 2 +- core/src/mindustry/world/blocks/storage/CoreBlock.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 9a1c16842e..841c6265d0 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -657,8 +657,8 @@ public class Blocks implements ContentList{ craftTime = 35f; size = 2; - consumes.power(1f); - consumes.liquid(Liquids.slag, 0.07f); + consumes.power(1.1f); + consumes.liquid(Liquids.slag, 4f / 60f); }}; disassembler = new Separator("disassembler"){{ diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 1f0486a223..f97385122c 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -356,7 +356,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ Events.fire(new TapEvent(player, tile)); } - @Remote(targets = Loc.both, called = Loc.both, forward = true) + @Remote(targets = Loc.both, called = Loc.server, forward = true) public static void buildingControlSelect(Player player, Building build){ if(player == null || build == null || player.dead()) return; diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 8963e1fcd1..621c36b25a 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -248,7 +248,7 @@ public class CoreBlock extends StorageBlock{ @Override public void onControlSelect(Player player){ Fx.spawn.at(player); - if(net.client()){ + if(net.client() && player == Vars.player){ control.input.controlledType = null; }