From 8a36b3e5900096a8089adbf49f13e3b08fc5284c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 26 Aug 2020 14:35:43 -0400
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/ui/fragments/ChatFragment.java          | 2 +-
 core/src/mindustry/ui/fragments/ScriptConsoleFragment.java | 6 +++++-
 core/src/mindustry/world/Tiles.java                        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java
index cbc8bacf39..e07c5dc310 100644
--- a/core/src/mindustry/ui/fragments/ChatFragment.java
+++ b/core/src/mindustry/ui/fragments/ChatFragment.java
@@ -62,7 +62,7 @@ public class ChatFragment extends Table{
 
         update(() -> {
 
-            if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null || ui.minimapfrag.shown())){
+            if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null || ui.minimapfrag.shown()) && !ui.scriptfrag.shown()){
                 toggle();
             }
 
diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
index b3576338ca..73861538e3 100644
--- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
+++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
@@ -44,7 +44,7 @@ public class ScriptConsoleFragment extends Table{
         font = Fonts.def;
 
         visible(() -> {
-            if(input.keyTap(Binding.console)  && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null)){
+            if(input.keyTap(Binding.console)  && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null) && !ui.chatfrag.shown()){
                 shown = !shown;
                 if(shown && !open && enableConsole){
                     toggle();
@@ -218,6 +218,10 @@ public class ScriptConsoleFragment extends Table{
         return open;
     }
 
+    public boolean shown(){
+        return shown;
+    }
+
     public void addMessage(String message){
         messages.insert(0, message);
     }
diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java
index 3fa0a0aef0..e525350c0c 100644
--- a/core/src/mindustry/world/Tiles.java
+++ b/core/src/mindustry/world/Tiles.java
@@ -72,7 +72,7 @@ public class Tiles implements Iterable<Tile>{
         return get(Point2.x(pos), Point2.y(pos));
     }
 
-    public void each(Cons<Tile> cons){
+    public void eachTile(Cons<Tile> cons){
         for(Tile tile : array){
             cons.get(tile);
         }