Many bugfixes / Support for repairing derelict in selection

core/src/mindustry/entities/Units.java

@@ -112,6 +112,10 @@ public class Units{
         return player == null || tile == null || tile.interactable(player.team()) || state.rules.editor;
     }
 
+    public static boolean isHittable(@Nullable Posc target, boolean air, boolean ground){
+        return target != null && (target instanceof Buildingc ? ground : (target instanceof Unit u && u.checkTarget(air, ground)));
+    }
+
     /**
      * Validates a target.
      * @param target The target to validate

core/src/mindustry/entities/comp/PayloadComp.java

@@ -90,6 +90,8 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     }
 
     void pickup(Unit unit){
+        if(unit.isAdded()) unit.team.data().updateCount(unit.type, 1);
+
         unit.remove();
         addPayload(new UnitPayload(unit));
         Fx.unitPickup.at(unit);