From 811c22b84eb60665600f8fb94ee258f1ba7f82ed Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 29 Dec 2019 15:40:56 -0500
Subject: [PATCH] Added camera movement while paused

---
 core/src/mindustry/core/Renderer.java                | 12 +++++++-----
 core/src/mindustry/input/DesktopInput.java           |  4 ++--
 .../ui/fragments/ScriptConsoleFragment.java          |  2 +-
 gradle.properties                                    |  2 +-
 server/src/mindustry/server/ServerControl.java       |  4 ++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 9c284a5f06..7d5e6714b5 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -123,12 +123,14 @@ public class Renderer implements ApplicationListener{
 
             if(player.isDead()){
                 TileEntity core = player.getClosestCore();
-                if(core != null && player.spawner == null){
-                    camera.position.lerpDelta(core.x, core.y, 0.08f);
-                }else if(core != null){
-                    camera.position.lerpDelta(position, 0.08f);
+                if(core != null){
+                    if(player.spawner == null){
+                        camera.position.lerpDelta(core.x, core.y, 0.08f);
+                    }else{
+                        camera.position.lerpDelta(position, 0.08f);
+                    }
                 }
-            }else if(control.input instanceof DesktopInput){
+            }else if(control.input instanceof DesktopInput && !state.isPaused()){
                 camera.position.lerpDelta(position, 0.08f);
             }
 
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index b1d483df37..e2efcac160 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -136,9 +136,9 @@ public class DesktopInput extends InputHandler{
             ui.listfrag.toggle();
         }
 
-        if(player.getClosestCore() == null && !ui.chatfrag.shown()){
+        if((player.getClosestCore() == null || state.isPaused()) && !ui.chatfrag.shown()){
             //move camera around
-            float camSpeed = 6f;
+            float camSpeed = !Core.input.keyDown(Binding.dash) ? 3f : 8f;
             Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed));
         }
 
diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
index 15149e064a..378359f631 100644
--- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
+++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
@@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{
                 clearChatInput();
             }
 
-            return shown;
+            return shown && Vars.net.active();
         });
 
         update(() -> {
diff --git a/gradle.properties b/gradle.properties
index 51de1f3142..8ed0e699dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=fe82ca9037028044764cc4b02fdbf851e3d09f78
+archash=14b6027d79cda5e02d74a7c2f85eb7e768c7abeb
diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java
index 352331f80c..d834ecd907 100644
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -1,11 +1,11 @@
 package mindustry.server;
 
 import arc.*;
+import arc.files.*;
 import arc.struct.*;
 import arc.struct.Array.*;
-import arc.files.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.Timer;
 import arc.util.CommandHandler.*;
 import arc.util.Timer.*;