From 7d7557ae4a94a7a4e46147cc3ceeb55262c85e4c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 26 Dec 2020 20:04:46 +0200 Subject: [PATCH] Caught modding errors - classic. --- core/src/com/unciv/models/ruleset/Building.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index eead8132d4..cfc6c8fdee 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -347,8 +347,11 @@ class Building : NamedStats(), IConstruction { } } - if (requiredBuilding != null && !construction.containsBuildingOrEquivalent(requiredBuilding!!)) + if (requiredBuilding != null && !construction.containsBuildingOrEquivalent(requiredBuilding!!)) { + if (!civInfo.gameInfo.ruleSet.buildings.containsKey(requiredBuilding!!)) + return "Requires a [${requiredBuilding}] in this city, which doesn't seem to exist in this ruleset!" return "Requires a [${civInfo.getEquivalentBuilding(requiredBuilding!!)}] in this city" + } if (cannotBeBuiltWith != null && construction.isBuilt(cannotBeBuiltWith!!)) return "Cannot be built with $cannotBeBuiltWith"