Waveskip / Stat fixes / 3x3 thermalpump / Removed liquid tiers

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

@@ -143,16 +143,21 @@ public class Units{
 
     /**Returns the closest target enemy. First, units are checked, then tile entities.*/
     public static TargetTrait getClosestTarget(Team team, float x, float y, float range){
-        return getClosestTarget(team, x, y, range, u -> !u.isDead() && u.isAdded());
+        return getClosestTarget(team, x, y, range, Unit::isValid);
     }
 
     /**Returns the closest target enemy. First, units are checked, then tile entities.*/
     public static TargetTrait getClosestTarget(Team team, float x, float y, float range, Predicate<Unit> unitPred){
+        return getClosestTarget(team, x, y, range, unitPred, t -> true);
+    }
+
+    /**Returns the closest target enemy. First, units are checked, then tile entities.*/
+    public static TargetTrait getClosestTarget(Team team, float x, float y, float range, Predicate<Unit> unitPred, Predicate<Tile> tilePred){
         Unit unit = getClosestEnemy(team, x, y, range, unitPred);
         if(unit != null){
             return unit;
         }else{
-            return findEnemyTile(team, x, y, range, tile -> true);
+            return findEnemyTile(team, x, y, range, tilePred);
         }
     }
 

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -462,11 +462,8 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
 
     //region update methods
 
-    Vector2 last = new Vector2();
-
     @Override
     public void update(){
-        last.set(this);
 
         hitTime -= Time.delta();
 
@@ -685,7 +682,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
                 if(target == null){
                     isShooting = false;
                     if(Core.settings.getBool("autotarget")){
-                        target = Units.getClosestTarget(team, x, y, getWeapon().bullet.range(), u -> u.getTeam() != Team.none);
+                        target = Units.getClosestTarget(team, x, y, getWeapon().bullet.range(), u -> u.getTeam() != Team.none, u -> u.getTeam() != Team.none);
 
                         if(mech.canHeal && target == null){
                             target = Geometry.findClosest(x, y, world.indexer.getDamaged(Team.blue));