Balance & bugfixes

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

@@ -90,6 +90,12 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return 0;
     }
 
+    @Override
+    @Replace
+    public boolean canDrown(){
+        return isGrounded() && !hovering && type.canDrown && !(this instanceof WaterMovec);
+    }
+
     @Override
     public int itemCapacity(){
         return type.itemCapacity;

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

@@ -83,12 +83,6 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
         }
     }
 
-    @Replace
-    @Override
-    public boolean canDrown(){
-        return false;
-    }
-
     @Replace
     public float floorSpeedMultiplier(){
         Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();