Merge branch 'master' of https://github.com/Anuken/Mindustry

core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java

@@ -60,7 +60,7 @@ public class ContinuousLaserBulletType extends BulletType{
 
     @Override
     public float range(){
-        return length;
+        return Math.max(length, maxRange);
     }
 
     @Override

core/src/mindustry/entities/bullet/LaserBulletType.java

@@ -56,7 +56,7 @@ public class LaserBulletType extends BulletType{
 
     @Override
     public float range(){
-        return length;
+        return Math.max(length, maxRange);
     }
 
     @Override

core/src/mindustry/entities/bullet/SapBulletType.java

@@ -50,7 +50,7 @@ public class SapBulletType extends BulletType{
 
     @Override
     public float range(){
-        return length;
+        return Math.max(length, maxRange);
     }
 
     @Override

core/src/mindustry/entities/bullet/ShrapnelBulletType.java

@@ -47,7 +47,7 @@ public class ShrapnelBulletType extends BulletType{
 
     @Override
     public float range(){
-        return length;
+        return Math.max(length, maxRange);
     }
 
     @Override

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

@@ -186,6 +186,10 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return !disarmed && !(type.canBoost && isFlying());
     }
 
+    public boolean isCounted(){
+        return type.isCounted;
+    }
+
     @Override
     public int itemCapacity(){
         return type.itemCapacity;