From 4f72011cf74817fd129b940dfd375b3fb82af096 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 15 Aug 2018 21:00:40 -0400
Subject: [PATCH] Fixed markup crash / setsector command fixed / Drone crash
 fixed

---
 build.gradle                                    |  2 +-
 .../mindustry/entities/units/types/Drone.java   |  4 ++--
 .../mindustry/ui/fragments/ChatFragment.java    | 17 +++++++++++++++--
 .../anuke/mindustry/server/ServerControl.java   |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1a5b493aab..8f262d8a3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '76dc741b49'
+        uCoreVersion = '2f18f69ffb'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java
index 2d42be599b..c5b50d620b 100644
--- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java
+++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java
@@ -190,7 +190,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
         public void update(){
             ItemDrop item = (ItemDrop) target;
 
-            if(inventory.isFull() || !inventory.canAcceptItem(item.getItem(), 1)){
+            if(item == null || inventory.isFull() || !inventory.canAcceptItem(item.getItem(), 1)){
                 setState(drop);
                 return;
             }
@@ -329,7 +329,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
     public void update(){
         super.update();
 
-        if(target != null && target.getTeam() != team){
+        if(state.is(repair) && target != null && target.getTeam() != team){
             target = null;
         }
 
diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
index ee7c80b392..a590ba4367 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
@@ -61,10 +61,15 @@ public class ChatFragment extends Table{
         visible(() -> !state.is(State.menu) && Net.active());
 
         update(() -> {
-            if(!Net.active() && chatOpen){
-                hide();
+            if(!Net.active()){
+                clearMessages();
+
+                if(chatOpen){
+                    hide();
+                }
             }
 
+
             if(Net.active() && Inputs.keyTap("chat")){
                 toggle();
             }
@@ -109,9 +114,17 @@ public class ChatFragment extends Table{
                 super.draw(batch, parentAlpha);
                 getStyle().font.getData().markupEnabled = true;
             }
+
+            @Override
+            protected void updateDisplayText(){
+                getStyle().font.getData().markupEnabled = false;
+                super.updateDisplayText();
+                getStyle().font.getData().markupEnabled = true;
+            }
         };
         chatfield.setTextFieldFilter((field, c) -> field.getText().length() < Vars.maxTextLength);
         chatfield.getStyle().background = null;
+        chatfield.getStyle().messageFont = null;
         chatfield.getStyle().fontColor = Color.WHITE;
         chatfield.setStyle(chatfield.getStyle());
         chatfield.update(() -> {
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 5345a94d21..ab3d92337f 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -269,7 +269,7 @@ public class ServerControl extends Module{
             }
         });
 
-        handler.register("setsector <x> <y>", "Sets the next sector to be played. Does not affect current game.", arg -> {
+        handler.register("setsector", "<x> <y>", "Sets the next sector to be played. Does not affect current game.", arg -> {
             try{
                 Settings.putInt("sector_x", Integer.parseInt(arg[0]));
                 Settings.putInt("sector_y", Integer.parseInt(arg[1]));