From c9b77e4e2350db907d1688136264309efbcb9f1f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 3 Jul 2018 12:27:37 -0400
Subject: [PATCH] Crash fixes

---
 build.gradle                                            | 2 +-
 core/src/io/anuke/mindustry/core/NetServer.java         | 2 +-
 core/src/io/anuke/mindustry/input/DesktopInput.java     | 2 +-
 core/src/io/anuke/mindustry/input/MobileInput.java      | 2 +-
 server/src/io/anuke/mindustry/server/ServerControl.java | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index a40e053862..64a541e770 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
         aiVersion = '1.8.1'
-        uCoreVersion = 'bc1c2e0848'
+        uCoreVersion = '5f35012fef'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index d15f317f57..d4b684e624 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -457,7 +457,7 @@ public class NetServer extends Module{
         }
     }
 
-    private static void onDisconnect(Player player){
+    public static void onDisconnect(Player player){
         Call.sendMessage("[accent]" + player.name + " has disconnected.");
         Call.onPlayerDisconnect(player.id);
         player.remove();
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index 9c7a3fe327..3dbadd3123 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -313,7 +313,7 @@ public class DesktopInput extends InputHandler{
             float ya = Inputs.getAxis(section, "cursor_y");
 
             if(Math.abs(xa) > controllerMin || Math.abs(ya) > controllerMin) {
-                float scl = Settings.getInt("sensitivity")/100f * Unit.dp.scl(1f);
+                float scl = Settings.getInt("sensitivity", 100)/100f * Unit.dp.scl(1f);
                 controlx += xa*baseControllerSpeed*scl;
                 controly -= ya*baseControllerSpeed*scl;
                 controlling = true;
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index 88555a84b9..241899ddf1 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -322,7 +322,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         for(PlaceRequest request : selection){
             Tile tile = request.tile();
 
-            if(tile == null) continue;
+            if(tile == null || recipe == null) continue;
 
             if ((!request.remove && validPlace(tile.x, tile.y, request.recipe.result, request.rotation))
                     || (request.remove && validBreak(tile.x, tile.y))) {
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 25f173049c..fb127c26a7 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -220,6 +220,11 @@ public class ServerControl extends Module {
                 if(playerGroup.size() > 0) {
                     info("&lyPlayers: {0}", playerGroup.size());
                     for (Player p : playerGroup.all()) {
+                        //TODO
+                        if(Net.getConnection(p.clientid) == null){
+                            netServer.onDisconnect(p);
+                            continue;
+                        }
                         print("   &y{0} / Connection {1} / IP: {2}", p.name, p.clientid, Net.getConnection(p.clientid).address);
                     }
                 }else{