From c5cab907c1cda24f8fb7999b4afe7b4ad91c4786 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Thu, 7 Nov 2024 12:33:39 +0200 Subject: [PATCH] Resolved #12409 - Don't assume the city-state ally knows the civ that attacked the city-state --- .../unciv/logic/civilization/diplomacy/CityStateFunctions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt index de4ffb32c4..dc81abd0b2 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt @@ -682,7 +682,7 @@ class CityStateFunctions(val civInfo: Civilization) { // Even if we aren't *technically* protectors, we *can* still be pissed you attacked our allies* val allyCivName = civInfo.getAllyCiv() val allyCiv = if (allyCivName != null) civInfo.gameInfo.getCivilization(allyCivName) else null - if (allyCiv != null && allyCiv !in civInfo.cityStateFunctions.getProtectorCivs()){ + if (allyCiv != null && allyCiv !in civInfo.cityStateFunctions.getProtectorCivs() && allyCiv.knows(attacker)){ val allyDiplomacy = allyCiv.getDiplomacyManager(attacker)!! // Less than if we were protectors allyDiplomacy.addModifier(DiplomaticModifiers.AttackedAlliedMinor, -10f)