Code cleanup

core/src/io/anuke/mindustry/core/Control.java

@@ -8,7 +8,10 @@ import io.anuke.arc.graphics.GL20;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.TextureAtlas;
 import io.anuke.arc.input.KeyCode;
-import io.anuke.arc.util.*;
+import io.anuke.arc.util.BufferUtils;
+import io.anuke.arc.util.Interval;
+import io.anuke.arc.util.Strings;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Mechs;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Effects;

core/src/io/anuke/mindustry/core/World.java

@@ -1,5 +1,6 @@
 package io.anuke.mindustry.core;
 
+import io.anuke.annotations.Annotations.Nullable;
 import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Core;
 import io.anuke.arc.Events;
@@ -96,11 +97,11 @@ public class World implements ApplicationListener{
         return tiles == null ? 0 : tiles[0].length;
     }
 
-    public Tile tile(int pos){
+    public @Nullable Tile tile(int pos){
         return tiles == null ? null : tile(Pos.x(pos), Pos.y(pos));
     }
 
-    public Tile tile(int x, int y){
+    public @Nullable Tile tile(int x, int y){
         if(tiles == null){
             return null;
         }
@@ -112,7 +113,7 @@ public class World implements ApplicationListener{
         return tiles[x][y];
     }
 
-    public Tile tileWorld(float x, float y){
+    public @Nullable Tile tileWorld(float x, float y){
         return tile(Math.round(x / tilesize), Math.round(y / tilesize));
     }
 
@@ -271,6 +272,11 @@ public class World implements ApplicationListener{
                 if(invalidMap){
                     ui.showError("$map.nospawn.pvp");
                 }
+            }else if(!state.rules.waves){ //pvp maps need two cores to be valid
+                invalidMap = state.teams.get(waveTeam).cores.isEmpty();
+                if(invalidMap){
+                    ui.showError("$map.nospawn.attack");
+                }
             }
         }else{
             invalidMap = true;

core/src/io/anuke/mindustry/editor/MapGenerateDialog.java

@@ -233,7 +233,7 @@ public class MapGenerateDialog extends FloatingDialog{
                         Tile tile = editor.tile(x, y);
                         DummyTile write = writeTiles[x][y];
 
-                        tile.setRotation((byte)write.rotation);
+                        tile.setRotation(write.rotation);
                         tile.setFloor((Floor)content.block(write.floor));
                         tile.setBlock(content.block(write.block));
                         tile.setTeam(Team.all[write.team]);

core/src/io/anuke/mindustry/editor/MapRenderer.java

@@ -140,7 +140,7 @@ public class MapRenderer implements Disposable{
             offsetX = tilesize/2f - region.getWidth()/2f * Draw.scl;
             offsetY = tilesize/2f - region.getHeight()/2f * Draw.scl;
         }else if(wall == Blocks.air && tile.ore() != null){
-            region = tile.ore().editorVariantRegions()[Mathf.randomSeed(idxWall, 0, tile.ore().editorVariantRegions().length-1)];;
+            region = tile.ore().editorVariantRegions()[Mathf.randomSeed(idxWall, 0, tile.ore().editorVariantRegions().length-1)];
         }else{
             region = Core.atlas.find("clear-editor");
         }

core/src/io/anuke/mindustry/entities/Effects.java

@@ -156,11 +156,11 @@ public class Effects{
         }
     }
 
-    public static interface EffectProvider{
+    public interface EffectProvider{
         void createEffect(Effect effect, Color color, float x, float y, float rotation, Object data);
     }
 
-    public static interface EffectRenderer{
+    public interface EffectRenderer{
         void render(EffectContainer effect);
     }
 }

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

@@ -308,25 +308,20 @@ public abstract class InputHandler implements InputProcessor{
         }
     }
 
-    public boolean cursorNear(){
-        return true;
-    }
-
     public void tryPlaceBlock(int x, int y){
-        if(block != null && validPlace(x, y, block, rotation) && cursorNear()){
+        if(block != null && validPlace(x, y, block, rotation)){
             placeBlock(x, y, block, rotation);
         }
     }
 
     public void tryBreakBlock(int x, int y){
-        if(cursorNear() && validBreak(x, y)){
+        if(validBreak(x, y)){
             breakBlock(x, y);
         }
     }
 
     public boolean validPlace(int x, int y, Block type, int rotation){
-        return Build.validPlace(player.getTeam(), x, y, type, rotation) &&
-        Mathf.dst(player.x, player.y, x * tilesize, y * tilesize) < Player.placeDistance;
+        return Build.validPlace(player.getTeam(), x, y, type, rotation);
     }
 
     public boolean validBreak(int x, int y){

core/src/io/anuke/mindustry/world/blocks/production/PowerCrafter.java

@@ -67,10 +67,7 @@ public class PowerCrafter extends Block{
         if(outputItem != null && tile.entity.items.get(outputItem) >= itemCapacity){
             return false;
         }
-        if(outputLiquid != null && tile.entity.liquids.get(outputLiquid) >= liquidCapacity - 0.01f){
-            return false;
-        }
-        return true;
+        return outputLiquid == null || !(tile.entity.liquids.get(outputLiquid) >= liquidCapacity - 0.01f);
     }
 
     @Override