diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index 0bf239a3b3..840e039c1f 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.Vars; +import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.graphics.Fx; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.resource.ItemStack; @@ -26,6 +27,7 @@ import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Tmp; import static io.anuke.mindustry.Vars.*; +import static io.anuke.mindustry.Vars.player; public abstract class InputHandler extends InputAdapter{ public float breaktime = 0; @@ -105,9 +107,11 @@ public abstract class InputHandler extends InputAdapter{ return false; } } - - if(!Vars.android && Tmp.r2.overlaps(player.hitbox.getRect(player.x, player.y))){ - return false; + + for(Player player : Vars.control.playerGroup.all()){ + if(!player.isAndroid && Tmp.r2.overlaps(player.hitbox.getRect(player.x, player.y))){ + return false; + } } Tile tile = world.tile(x, y); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index 08ea4faf33..b07cc5853c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -50,6 +50,7 @@ public class FileChooser extends FloatingDialog { Table content = new Table(); filefield = new TextField(); + filefield.setOnlyFontChars(false); if(!open) Mindustry.platforms.addDialog(filefield); filefield.setDisabled(open); diff --git a/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java index 0a53b84e92..2ef10a2430 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java @@ -52,6 +52,7 @@ public class DefenseBlocks{ range = 30; reload = 60f; health = 60; + powerUsed = 0.08f; } }, @@ -59,8 +60,8 @@ public class DefenseBlocks{ { range = 44; reload = 30f; - powerUsed = 0.15f; health = 90; + powerUsed = 0.13f; } },