From 30b7e4646f417a85e6a552e23bf38bcdd415861d Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Sat, 12 Feb 2022 11:27:46 -0500 Subject: [PATCH] Fix ship generation --- src/jvmMain/kotlin/starshipfights/auth/providers.kt | 1 + src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jvmMain/kotlin/starshipfights/auth/providers.kt b/src/jvmMain/kotlin/starshipfights/auth/providers.kt index 23973b1..7322bae 100644 --- 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 1aeb0ea..7584fde 100644 --- 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 = 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] } } -- 2.25.1