From 8413046dd8fcfc728aae218eb05ce5e2ae9ec71b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 21 Mar 2019 15:37:36 -0400
Subject: [PATCH] Crash/visual fixes

---
 core/src/io/anuke/mindustry/input/InputHandler.java         | 2 +-
 core/src/io/anuke/mindustry/input/MobileInput.java          | 2 +-
 core/src/io/anuke/mindustry/world/Block.java                | 4 ++++
 .../io/anuke/mindustry/world/blocks/power/PowerNode.java    | 2 +-
 desktop/build.gradle                                        | 6 ------
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java
index 46e442a818..943d8a0eca 100644
--- a/core/src/io/anuke/mindustry/input/InputHandler.java
+++ b/core/src/io/anuke/mindustry/input/InputHandler.java
@@ -241,7 +241,7 @@ public abstract class InputHandler implements InputProcessor{
     boolean canMine(Tile tile){
         return !Core.scene.hasMouse()
                 && tile.drop() != null && tile.drop().hardness <= player.mech.drillPower
-                && !tile.floor().playerUnmineable
+                && !(tile.floor().playerUnmineable && tile.ore() == Blocks.air)
                 && player.acceptsItem(tile.drop())
                 && tile.block() == Blocks.air && player.dst(tile.worldx(), tile.worldy()) <= Player.mineDistance;
     }
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index 554cf9af09..7a4bd1fb63 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -365,7 +365,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
             if(!request.remove && request == lastPlaced && request.block != null){
                 Draw.mixcol();
-                drawArrow(request.block, tile.x, tile.y, request.rotation);
+                if(request.block.rotate) drawArrow(request.block, tile.x, tile.y, request.rotation);
             }
 
             Draw.mixcol(Tmp.c1, 1f);
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 749ee5cc64..0c99fbe8e9 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -143,6 +143,10 @@ public class Block extends BlockStorage{
     }
 
     protected void powerGraphRemoved(Tile tile){
+        if(tile.entity == null || tile.entity.power == null || tile.entity.power.graph == null){
+            return;
+        }
+
         tile.entity.power.graph.remove(tile);
         for(int i = 0; i < tile.entity.power.links.size; i++){
             Tile other = world.tile(tile.entity.power.links.get(i));
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
index 338b433d9f..9316b371c4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
@@ -125,7 +125,7 @@ public class PowerNode extends PowerBlock{
 
     @Override
     public void update(Tile tile){
-        tile.entity.power.graph.update();
+        if(tile.entity != null && tile.entity.power != null && tile.entity.power.graph != null) tile.entity.power.graph.update();
     }
 
     @Override
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 713244db0d..b87f9d5be4 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -69,12 +69,6 @@ task dist(type: Jar){
     }
 }
 
-task ttt(){
-    fileTree("/home/anuke/Projects/Mindustry/deploy/Mindustry-Linux64-4-beta-66/jre/lib/amd64/newst").each{t ->
-        println("\"jre/lib/amd64/${t.absoluteFile.name}\",")
-    }
-}
-
 //note: call desktop:dist beforehand
 task packrCmd(){