Fix ship generation

diff --git a/src/jvmMain/kotlin/starshipfights/auth/providers.kt b/src/jvmMain/kotlin/starshipfights/auth/providers.kt
index 23973b13f2ed4a66928d674f3a86db52593da44b..7322bae068e8e4c3e88814f4a6d82da4e46d4f26 100644 (file)
--- a/src/jvmMain/kotlin/starshipfights/auth/providers.kt
+++ b/src/jvmMain/kotlin/starshipfights/auth/providers.kt
@@ -260,6 +260,7 @@ interface AuthProvider {
                                        if (admiral.owningUser != currentUser) throw ForbiddenException()
                                        
                                        Admiral.del(admiralId)
+                                       ShipInDrydock.remove(ShipInDrydock::owningAdmiral eq admiralId)
                                        redirect("/me")
                                }
                                

diff --git a/src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt b/src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt
index 1aeb0ea5e3eeee05406c749bcf7a2d56f7dcf748..7584fde3775e3dc727e1c81e40b174296af69a4b 100644 (file)
--- a/src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt
+++ b/src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt
@@ -120,7 +120,7 @@ fun generateFleet(admiral: Admiral): List<ShipInDrydock> = ShipWeightClass.value
                if (shipTypes.isEmpty())
                        emptyList()
                else
-                       (0..((admiral.rank.maxShipWeightClass.rank - swc.rank) * 2 + 1).coerceAtLeast(0)).map { i ->
+                       (0 until ((admiral.rank.maxShipWeightClass.rank - swc.rank) * 2 + 1).coerceAtLeast(0)).map { i ->
                                shipTypes[i % shipTypes.size]
                        }
        }