From 5b25ec049537bdcfd40f016d8995e1601cde560c Mon Sep 17 00:00:00 2001
From: 9kgsofrice <65415105+9kgsofrice@users.noreply.github.com>
Date: Wed, 30 Dec 2020 19:07:24 +0000
Subject: [PATCH] "happiness from garrison" effect was duplicated (#3485)

---
 core/src/com/unciv/logic/city/CityStats.kt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt
index dc69a15abb..84ff33d50e 100644
--- a/core/src/com/unciv/logic/city/CityStats.kt
+++ b/core/src/com/unciv/logic/city/CityStats.kt
@@ -221,10 +221,6 @@ class CityStats {
             happinessFromPolicies += 1f
         happinessFromPolicies += getStatsFromUniques(civInfo.policies.policyUniques.getAllUniques()).happiness
 
-        if (cityInfo.getCenterTile().militaryUnit != null)
-            for (unique in civInfo.getMatchingUniques("[] in all cities with a garrison"))
-                happinessFromPolicies += unique.stats.happiness
-
         newHappinessList["Policies"] = happinessFromPolicies
 
         if (hasExtraAnnexUnhappiness()) newHappinessList["Occupied City"] = -2f //annexed city