diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index 72a73e5156..a37db1b058 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -20,7 +20,7 @@ import io.anuke.kryonet.DefaultThreadImpl; import io.anuke.kryonet.KryoClient; import io.anuke.kryonet.KryoServer; import io.anuke.mindustry.core.ThreadHandler.ThreadProvider; -import io.anuke.mindustry.io.Platform; +import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.net.Net; import io.anuke.ucore.core.Settings; import io.anuke.ucore.scene.ui.TextField; diff --git a/core/src/io/anuke/mindustry/input/GestureHandler.java b/core/src/io/anuke/mindustry/input/GestureHandler.java index 2eecb54ac6..e7544ed613 100644 --- a/core/src/io/anuke/mindustry/input/GestureHandler.java +++ b/core/src/io/anuke/mindustry/input/GestureHandler.java @@ -46,9 +46,9 @@ public class GestureHandler extends GestureAdapter{ public boolean pan(float x, float y, float deltaX, float deltaY){ if(control.showCursor() && !Inputs.keyDown("select")) return false; - if(!control.showCursor() && !(control.input().recipe != null + if((!control.showCursor() && !(control.input().recipe != null && control.input().placeMode.lockCamera && state.inventory.hasItems(control.input().recipe.requirements)) && - !(control.input().recipe == null && control.input().breakMode.lockCamera)){ + !(control.input().recipe == null && control.input().breakMode.lockCamera)) && !ui.hasMouse(x, y)){ float dx = deltaX*Core.camera.zoom/Core.cameraScale, dy = deltaY*Core.camera.zoom/Core.cameraScale; player.x -= dx; player.y += dy; diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index a636ba545a..d98aed3a78 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -33,6 +33,7 @@ public class PlayerListFragment implements Fragment{ public void build(){ new table(){{ new table("pane"){{ + touchable(Touchable.enabled); margin(14f); new label(() -> Bundles.format(playerGroup.size() == 1 ? "text.players.single" : "text.players", playerGroup.size()));