From 790bfc10b7c4677e8bfcdef647766eb2d2e71d99 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sat, 15 Jan 2022 23:16:28 +0200 Subject: [PATCH] Resolved #5980 - "Cannot be built with" catches building equivalents as well --- core/src/com/unciv/models/ruleset/Building.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index 6a10f19fa1..0ffb7b4612 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -666,7 +666,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction { } val cannotBeBuiltWithUnique = uniqueObjects .firstOrNull { it.isOfType(UniqueType.CannotBeBuiltWith) } - if (cannotBeBuiltWithUnique != null && cityConstructions.isBuilt(cannotBeBuiltWithUnique.params[0])) + if (cannotBeBuiltWithUnique != null && cityConstructions.containsBuildingOrEquivalent(cannotBeBuiltWithUnique.params[0])) rejectionReasons.add(RejectionReason.CannotBeBuiltWith.apply { errorMessage = cannotBeBuiltWithUnique.text }) for ((resource, amount) in getResourceRequirements())