From 174e4b8632ac2ebd6e12020c1a99cc11f7cd5ec6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 24 Aug 2020 23:55:19 -0400
Subject: [PATCH] Bugfixes

---
 core/assets/bundles/bundle.properties         |  1 +
 core/src/mindustry/input/DesktopInput.java    | 22 +++++++++----------
 .../world/blocks/logic/LogicBlock.java        |  2 ++
 gradle.properties                             |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 038812fc4e..56f21ac68e 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1077,6 +1077,7 @@ block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 block.segment.name = Segment
+block.command-center.name = Command Center
 block.ground-factory.name = Ground Factory
 block.air-factory.name = Air Factory
 block.naval-factory.name = Naval Factory
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index f194c64fb8..b3d48e34cc 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -47,6 +47,15 @@ public class DesktopInput extends InputHandler{
 
     @Override
     public void buildUI(Group group){
+        group.fill(t -> {
+            t.visible(() -> Core.settings.getBool("hints") && !player.dead() && !player.unit().spawnedByCore() && !(Core.settings.getBool("hints") && lastSchematic != null && !selectRequests.isEmpty()));
+            t.bottom();
+            t.table(Styles.black6, b -> {
+                b.defaults().left();
+                b.label(() -> Core.bundle.format("respawn", Core.keybinds.get(Binding.respawn).key.toString())).style(Styles.outlineLabel);
+            }).margin(6f);
+        });
+
         group.fill(t -> {
             t.bottom();
             t.visible(() -> {
@@ -79,15 +88,6 @@ public class DesktopInput extends InputHandler{
                 });
             }).margin(6f);
         });
-
-        group.fill(t -> {
-            t.visible(() -> Core.settings.getBool("hints") && !player.dead() && !player.unit().spawnedByCore());
-            t.bottom();
-            t.table(Styles.black6, b -> {
-                b.defaults().left();
-                b.label(() -> Core.bundle.format("respawn", Core.keybinds.get(Binding.respawn).key.toString())).style(Styles.outlineLabel);
-            }).margin(6f);
-        });
     }
 
     @Override
@@ -188,12 +188,12 @@ public class DesktopInput extends InputHandler{
             panning = true;
         }
 
-        if(Math.abs(Core.input.axis(Binding.move_x)) > 0 || Math.abs(Core.input.axis(Binding.move_y)) > 0){
+        if((Math.abs(Core.input.axis(Binding.move_x)) > 0 || Math.abs(Core.input.axis(Binding.move_y)) > 0) && (!scene.hasField())){
             panning = false;
         }
 
         //TODO awful UI state checking code
-        if(((player.dead() || state.isPaused()) && !ui.chatfrag.shown()) && (!(scene.getKeyboardFocus() instanceof TextField) && !scene.hasDialog())){
+        if(((player.dead() || state.isPaused()) && !ui.chatfrag.shown()) && (!scene.hasField() && !scene.hasDialog())){
             if(input.keyDown(Binding.mouse_move)){
                 panCam = true;
             }
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
index 9d49935bc5..9ed0e4f734 100644
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -307,6 +307,8 @@ public class LogicBlock extends Block{
                     }
 
                     asm.putConst("@this", this);
+                    asm.putConst("@thisx", x);
+                    asm.putConst("@thisy", y);
 
                     executor.load(asm);
                 }catch(Exception e){
diff --git a/gradle.properties b/gradle.properties
index a6745ba165..8529200382 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=5f54e2081760124a7d1a29d404dd9d01c5dbf448
+archash=2b13b4d008c3b5a35bf8ce3fc69a2de6708ba187