From 703f034054c1c12a771dc24e8a9a267fc4184fef Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 7 Aug 2019 18:16:51 -0400
Subject: [PATCH] Bugfixes

---
 core/assets/bundles/bundle.properties              | 2 +-
 core/src/io/anuke/mindustry/input/MobileInput.java | 5 ++---
 settings.gradle                                    | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ef23f4ed99..0bd99ac30f 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -984,7 +984,7 @@ block.liquid-tank.description = Stores a large amount of liquids. Use for creati
 block.liquid-junction.description = Acts as a bridge for two crossing conduits. Useful in situations with two different conduits carrying different liquids to different locations.
 block.bridge-conduit.description = Advanced liquid transport block. Allows transporting liquids over up to 3 tiles of any terrain or building.
 block.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles.
-block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks.
+block.power-node.description = Transmits power to connected nodes. The node will receive power from or supply power to any adjacent blocks.
 block.power-node-large.description = An advanced power node with greater range and more connections.
 block.surge-tower.description = An extremely long-range power node with fewer available connections.
 block.battery.description = Stores power as a buffer in times of surplus energy. Outputs power in times of deficit.
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index 6e8e96a81e..36c3a5c689 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -155,7 +155,6 @@ public class MobileInput extends InputHandler implements GestureListener{
                     return req;
                 }
             }else{
-
                 r1.setSize(other.block().size * tilesize);
                 r1.setCenter(other.worldx() + other.block().offset(), other.worldy() + other.block().offset());
 
@@ -248,7 +247,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     /** Draws a placement icon for a specific block. */
     void drawPlace(int x, int y, Block block, int rotation, int prevX, int prevY, int prevRotation){
-        if(validPlace(x, y, block, rotation)){
+        if(validPlace(x, y, block, rotation) && !checkOverlapPlacement(x, y, block)){
             block.getPlaceDraw(placeDraw, rotation, prevX, prevY, prevRotation);
 
             Draw.color();
@@ -509,7 +508,7 @@ public class MobileInput extends InputHandler implements GestureListener{
             if(mode == placing && isPlacing()){
                 iterateLine(lineStartX, lineStartY, tileX, tileY, l -> {
                     Tile tile = world.tile(l.x, l.y);
-                    if(tile != null && hasRequest(tile)){
+                    if(tile != null && checkOverlapPlacement(tile.x, tile.y, block)){
                         return;
                     }
 
diff --git a/settings.gradle b/settings.gradle
index 25adfcd763..20085aa2fb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -35,6 +35,7 @@ if(!hasProperty("release")){
         use(':Arc:backends:backend-robovm')
         use(':Arc:backends:backend-headless')
     }
+    
     if(new File(settingsDir, '../debug').exists()){
         use(':debug')
     }