Warning fix

build.gradle

@@ -160,7 +160,6 @@ project(":core") {
     }
 
     dependencies {
-        compileOnly project(":annotations")
         build.finalizedBy(finish)
 
         def comp = System.properties["release"] == null || System.properties["release"] == "false"
@@ -179,13 +178,9 @@ project(":core") {
         compile "com.badlogicgames.gdx:gdx:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
 
+        compileOnly project(":annotations")
         annotationProcessor project(":annotations")
     }
-
-    /*
-    compileJava.options.compilerArgs = [
-        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor,io.anuke.annotations.SerializeAnnotationProcessor"
-    ]*/
 }
 
 project(":server") {
@@ -198,7 +193,6 @@ project(":server") {
     }
     
     dependencies {
-        compileOnly project(":annotations")
 
         compile project(":core")
         compile project(":kryonet")

core/src/io/anuke/mindustry/ai/BlockIndexer.java

@@ -128,7 +128,11 @@ public class BlockIndexer{
                     for(int ty = ry * structQuadrantSize; ty < (ry + 1) * structQuadrantSize && ty < world.height(); ty++){
                         Tile other = world.tile(tx, ty);
 
-                        if(other == null || other.entity == null || other.getTeam() != team || !pred.test(other) || !other.block().targetable) continue;
+                        if(other == null) continue;
+
+                        other = other.target();
+
+                        if(other.entity == null || other.getTeam() != team || !pred.test(other) || !other.block().targetable) continue;
 
                         TileEntity e = other.entity;
 

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

@@ -41,16 +41,12 @@ public class Units{
         return target == null || (range != Float.MAX_VALUE && target.distanceTo(x, y) > range) || target.getTeam() == team || !target.isValid();
     }
 
-    /**
+    /**See {@link #invalidateTarget(TargetTrait, Team, float, float, float)}*/
-     * See {@link #invalidateTarget(TargetTrait, Team, float, float, float)}
-     */
     public static boolean invalidateTarget(TargetTrait target, Team team, float x, float y){
         return invalidateTarget(target, team, x, y, Float.MAX_VALUE);
     }
 
-    /**
+    /**See {@link #invalidateTarget(TargetTrait, Team, float, float, float)}*/
-     * See {@link #invalidateTarget(TargetTrait, Team, float, float, float)}
-     */
     public static boolean invalidateTarget(TargetTrait target, Unit targeter){
         return invalidateTarget(target, targeter.team, targeter.x, targeter.y, targeter.getWeapon().getAmmo().getRange());
     }
@@ -129,16 +125,12 @@ public class Units{
         return value[0];
     }
 
-    /**
+    /**Returns the neareset ally tile in a range.*/
-     * Returns the neareset ally tile in a range.
-     */
     public static TileEntity findAllyTile(Team team, float x, float y, float range, Predicate<Tile> pred){
         return world.indexer.findTile(team, x, y, range, pred);
     }
 
-    /**
+    /**Returns the neareset enemy tile in a range.*/
-     * Returns the neareset enemy tile in a range.
-     */
     public static TileEntity findEnemyTile(Team team, float x, float y, float range, Predicate<Tile> pred){
         for(Team enemy : state.teams.enemiesOf(team)){
             TileEntity entity = world.indexer.findTile(enemy, x, y, range, pred);
@@ -149,9 +141,7 @@ public class Units{
         return null;
     }
 
-    /**
+    /**Iterates over all units on all teams, including players.*/
-     * Iterates over all units on all teams, including players.
-     */
     public static void allUnits(Consumer<Unit> cons){
         //check all unit groups first
         for(EntityGroup<BaseUnit> group : unitGroups){
@@ -183,9 +173,7 @@ public class Units{
         }
     }
 
-    /**
+    /**Returns the closest enemy of this team. Filter by predicate.*/
-     * Returns the closest enemy of this team. Filter by predicate.
-     */
     public static Unit getClosestEnemy(Team team, float x, float y, float range, Predicate<Unit> predicate){
         result = null;
         cdist = 0f;
@@ -208,9 +196,7 @@ public class Units{
         return result;
     }
 
-    /**
+    /**Returns the closest ally of this team. Filter by predicate.*/
-     * Returns the closest ally of this team. Filter by predicate.
-     */
     public static Unit getClosest(Team team, float x, float y, float range, Predicate<Unit> predicate){
         result = null;
         cdist = 0f;
@@ -233,9 +219,7 @@ public class Units{
         return result;
     }
 
-    /**
+    /**Iterates over all units in a rectangle.*/
-     * Iterates over all units in a rectangle.
-     */
     public static void getNearby(Team team, Rectangle rect, Consumer<Unit> cons){
 
         EntityGroup<BaseUnit> group = unitGroups[team.ordinal()];
@@ -249,9 +233,7 @@ public class Units{
         });
     }
 
-    /**
+    /**Iterates over all units in a circle around this position.*/
-     * Iterates over all units in a circle around this position.
-     */
     public static void getNearby(Team team, float x, float y, float radius, Consumer<Unit> cons){
         rect.setSize(radius * 2).setCenter(x, y);
 
@@ -272,9 +254,7 @@ public class Units{
         });
     }
 
-    /**
+    /**Iterates over all units in a rectangle.*/
-     * Iterates over all units in a rectangle.
-     */
     public static void getNearby(Rectangle rect, Consumer<Unit> cons){
 
         for(Team team : Team.all){
@@ -288,9 +268,7 @@ public class Units{
         EntityQuery.getNearby(playerGroup, rect, player -> cons.accept((Unit) player));
     }
 
-    /**
+    /**Iterates over all units that are enemies of this team.*/
-     * Iterates over all units that are enemies of this team.
-     */
     public static void getNearbyEnemies(Team team, Rectangle rect, Consumer<Unit> cons){
         EnumSet<Team> targets = state.teams.enemiesOf(team);
 
@@ -309,9 +287,7 @@ public class Units{
         });
     }
 
-    /**
+    /**Iterates over all units.*/
-     * Iterates over all units.
-     */
     public static void getAllUnits(Consumer<Unit> cons){
 
         for(Team team : Team.all){
@@ -327,5 +303,4 @@ public class Units{
         }
     }
 
-
 }