From e4ff3d43d699a83519000e65fd70eae798eba327 Mon Sep 17 00:00:00 2001
From: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Date: Wed, 6 Oct 2021 16:09:20 +0200
Subject: [PATCH] prevent city states from taunting you (#5409)

---
 core/src/com/unciv/logic/civilization/CityStateFunctions.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
index fb6135d786..f681f6f83c 100644
--- a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
+++ b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
@@ -525,6 +525,7 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
     /** A city state was attacked. What are its protectors going to do about it??? Also checks for Wary */
     fun cityStateAttacked(attacker: CivilizationInfo) {
         if (!civInfo.isCityState()) return // What are we doing here?
+        if (attacker.isCityState()) return // City states can't be upset with each other
 
         // We might become wary!
         if (attacker.isMinorCivWarmonger()) { // They've attacked a lot of city-states