From cd7bd8fcfd99c3ba17533995dfea4648eea32b5a Mon Sep 17 00:00:00 2001
From: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Date: Tue, 31 Aug 2021 21:18:58 +0200
Subject: [PATCH] fix duplicated city-state bonus bug (#5042)

* fix city-state bug

* pt 2
---
 core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 6dd3db7e6b..7397afb11c 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -1160,11 +1160,11 @@ class CivilizationInfo {
         if (!isCityState())
             return false
         val eraInfo = getEraObject()
-        val bonuses = if (eraInfo == null) null
+        val allyBonuses = if (eraInfo == null) null
             else eraInfo.allyBonus[cityStateType.name]
-        if (bonuses != null) {
+        if (allyBonuses != null) {
             // Defined city states in json
-            bonuses.addAll(eraInfo!!.friendBonus[cityStateType.name]!!)
+            val bonuses = allyBonuses + eraInfo!!.friendBonus[cityStateType.name]!!
             for (bonus in bonuses) {
                 if (statType == Stat.Happiness && bonus.getPlaceholderText() == "Provides [] Happiness")
                     return true