From a4fd88a44004d2e1d5245e557c8f07d36e31cbc7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 4 May 2019 10:44:21 -0400
Subject: [PATCH] Bugfixes

---
 core/src/io/anuke/mindustry/entities/type/Player.java | 2 --
 core/src/io/anuke/mindustry/input/DesktopInput.java   | 4 +++-
 core/src/io/anuke/mindustry/io/TypeIO.java            | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java
index 6be33085c0..353ebfd538 100644
--- a/core/src/io/anuke/mindustry/entities/type/Player.java
+++ b/core/src/io/anuke/mindustry/entities/type/Player.java
@@ -416,8 +416,6 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
             Draw.color(0f, 0f, 0f, 0.3f * (textFadeTime <= 0 || lastText == null  ? 1f : visualFadeTime));
             Fill.rect(x, y + textHeight + layout.height - layout.height/2f, layout.width + 2, layout.height + 3);
             font.draw(text, x - width/2f, y + textHeight + layout.height, width, Align.center, true);
-
-            textFadeTime -= Time.delta() / (60 * 5);
         }
 
         Draw.reset();
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index 665eec4d3c..0327108f1d 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -8,6 +8,7 @@ import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
+import io.anuke.arc.scene.ui.TextField;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.graphics.Pal;
@@ -17,6 +18,7 @@ import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 
+import static io.anuke.arc.Core.scene;
 import static io.anuke.mindustry.Vars.*;
 import static io.anuke.mindustry.input.PlaceMode.*;
 
@@ -130,7 +132,7 @@ public class DesktopInput extends InputHandler{
             player.isShooting = false;
         }
 
-        if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !ui.chatfrag.chatOpen()){
+        if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !ui.chatfrag.chatOpen() && !(scene.getKeyboardFocus() instanceof TextField)){
             if(!ui.minimap.isShown()){
                 ui.minimap.show();
             }else{
diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java
index 367207d9b9..d785cbb1b3 100644
--- a/core/src/io/anuke/mindustry/io/TypeIO.java
+++ b/core/src/io/anuke/mindustry/io/TypeIO.java
@@ -214,12 +214,13 @@ public class TypeIO{
 
     @WriteClass(Liquid.class)
     public static void writeLiquid(ByteBuffer buffer, Liquid liquid){
-        buffer.put(liquid.id);
+        buffer.put(liquid == null ? -1 : liquid.id);
     }
 
     @ReadClass(Liquid.class)
     public static Liquid readLiquid(ByteBuffer buffer){
-        return content.liquid(buffer.get());
+        byte id = buffer.get();
+        return id == -1 ? null : content.liquid(buffer.get());
     }
 
     @WriteClass(BulletType.class)