From: TheSaminator <thesaminator@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:08:34 +0000 (-0400)
Subject: Fix wackiness
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=3b42a2e724a8db63cc2d1a900f38f9e6d9fd4c28;p=starship-fights

Fix wackiness
---

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<Factio
 		val Default: ClusterFactions
 			get() = ClusterFactions(FactionFlavor.values().associateWith { ClusterFactionMode.ALLOW })
 		
-		operator fun invoke(factions: Map<FactionFlavor, ClusterFactionMode>) = Default + ClusterFactions(factions)
+		fun of(factions: Map<FactionFlavor, ClusterFactionMode>) = 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 }