Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Potential fix for #5660

Browse Source
This commit is contained in:
Anuken
2021-07-28 11:51:20 -04:00
parent b64432dafd
commit fef8ee925b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -657,8 +657,8 @@ public class Blocks implements ContentList{
craftTime = 35f; craftTime = 35f;
size = 2; size = 2;
consumes.power(1f); consumes.power(1.1f);
consumes.liquid(Liquids.slag, 0.07f); consumes.liquid(Liquids.slag, 4f / 60f);
}}; }};
disassembler = new Separator("disassembler"){{ disassembler = new Separator("disassembler"){{

2
core/src/mindustry/input/InputHandler.java
View File

@@ -356,7 +356,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Events.fire(new TapEvent(player, tile)); 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){ public static void buildingControlSelect(Player player, Building build){
if(player == null || build == null || player.dead()) return; if(player == null || build == null || player.dead()) return;

2
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -248,7 +248,7 @@ public class CoreBlock extends StorageBlock{
@Override @Override
public void onControlSelect(Player player){ public void onControlSelect(Player player){
Fx.spawn.at(player); Fx.spawn.at(player);
if(net.client()){ if(net.client() && player == Vars.player){
control.input.controlledType = null; control.input.controlledType = null;
} }