Merge remote-tracking branch 'origin/master'

core/src/io/anuke/mindustry/input/DesktopInput.java

@@ -202,9 +202,6 @@ public class DesktopInput extends InputHandler{
         Tile selected = tileAt(Gdx.input.getX(), Gdx.input.getY());
         int cursorX = tileX(Gdx.input.getX());
         int cursorY = tileY(Gdx.input.getY());
-        //if(cursor == null){
-        //    return;
-        //}
 
         if(Inputs.keyTap(section, "deselect")){
             player.setMineTile(null);

core/src/io/anuke/mindustry/input/InputHandler.java

@@ -191,6 +191,10 @@ public abstract class InputHandler extends InputAdapter{
                 consumed = true;
                 frag.config.hideConfig();
             }
+
+            if(frag.config.isShown()){
+                consumed = true;
+            }
         }
 
         //call tapped event

core/src/io/anuke/mindustry/maps/Sectors.java

@@ -370,7 +370,7 @@ public class Sectors{
         for(int x = 1; x <= width; x++){
             for(int y = 1; y <= height; y++){
                 for(GridPoint2 point : Geometry.d8edge){
-                    int shiftx = (int)(-width/2f + (point.x * (width - 1))/2f), shifty = (int)(-height/2f + (point.y * (height - 1))/2f);
+                    int shiftx = (int)(-x/2f + (point.x * (x - 1))/2f), shifty = (int)(-y/2f + (point.y * (y - 1))/2f);
                     if(canFit(sector.x + shiftx, sector.y + shifty, x, y)){
                         finalWidth = x;
                         finalHeight = y;