From 7b2b9b398857efad2ffb37b837331b3d0c19a294 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 25 Aug 2020 09:24:49 -0400
Subject: [PATCH] Fixed #2416 / Fixed #2417

---
 core/src/mindustry/content/TechTree.java   | 19 ++++++++++---------
 core/src/mindustry/input/DesktopInput.java |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index d09d36604f..e7d21444a0 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -38,7 +38,6 @@ public class TechTree implements ContentList{
                         node(distributor);
                         node(sorter, () -> {
                             node(invertedSorter);
-                            node(message);
                             node(overflowGate, () -> {
                                 node(underflowGate);
                             });
@@ -206,19 +205,21 @@ public class TechTree implements ContentList{
                                     });
 
                                     node(microProcessor, () -> {
-                                        node(logicProcessor, () -> {
-                                            node(hyperProcessor, () -> {
-
-                                            });
-                                        });
-
                                         node(switchBlock, () -> {
-                                            node(logicDisplay, () -> {
+                                            node(message, () -> {
+                                                node(logicDisplay, () -> {
 
+                                                });
+
+                                                node(memoryCell, () -> {
+
+                                                });
                                             });
 
-                                            node(memoryCell, () -> {
+                                            node(logicProcessor, () -> {
+                                                node(hyperProcessor, () -> {
 
+                                                });
                                             });
                                         });
                                     });
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index b3d48e34cc..6128b2539a 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -188,7 +188,7 @@ 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) && (!scene.hasField())){
+        if((Math.abs(Core.input.axis(Binding.move_x)) > 0 || Math.abs(Core.input.axis(Binding.move_y)) > 0 || input.keyDown(Binding.mouse_move)) && (!scene.hasField())){
             panning = false;
         }