From 3b42a2e724a8db63cc2d1a900f38f9e6d9fd4c28 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Wed, 6 Jul 2022 13:08:34 -0400 Subject: [PATCH] Fix wackiness --- .../kotlin/net/starshipfights/campaign/cluster_params.kt | 2 +- .../kotlin/net/starshipfights/campaign/endpoints_campaign.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt b/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt index 3769fbf..33fae42 100644 --- a/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt +++ b/src/commonMain/kotlin/net/starshipfights/campaign/cluster_params.kt @@ -88,7 +88,7 @@ value class ClusterFactions private constructor(private val factions: Map) = Default + ClusterFactions(factions) + fun of(factions: Map) = Default + ClusterFactions(factions) } } diff --git a/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt b/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt index 956245c..4ac30b7 100644 --- a/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt +++ b/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt @@ -203,7 +203,7 @@ fun Routing.installCampaign() { val corruption = ClusterCorruption.values().valueOfOrRedirect(parameters.getOrFail("corruption")) { "Invalid value chosen for eldritch corruption" } val contention = ClusterContention.values().valueOfOrRedirect(parameters.getOrFail("contention")) { "Invalid value chosen for factional contention" } val factions = try { - ClusterFactions(FactionFlavor.values().mapNotNull { faction -> + ClusterFactions.of(FactionFlavor.values().mapNotNull { faction -> parameters["factions[${faction.toUrlSlug()}]"] ?.let { ClusterFactionMode.values().valueOfOrNull(it) } ?.let { faction to it } -- 2.25.1