From ec036dc3dd132aee79756cc5493efe1e5266e313 Mon Sep 17 00:00:00 2001
From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Date: Mon, 4 Oct 2021 16:18:06 +0200
Subject: [PATCH] Fixed a crash when killing a barbarian invading an unmet
 city-state (#5396)

---
 core/src/com/unciv/logic/battle/Battle.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index 583482c17c..33c5bff1eb 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -157,7 +157,7 @@ object Battle {
         // CS friendship from killing barbarians
         if (defeatedUnit.matchesCategory("Barbarian") && defeatedUnit.matchesCategory("Military") && civUnit.getCivInfo().isMajorCiv()) {
             for (cityState in UncivGame.Current.gameInfo.getAliveCityStates()) {
-                if (defeatedUnit.unit.threatensCiv(cityState)) {
+                if (civUnit.getCivInfo().knows(cityState) && defeatedUnit.unit.threatensCiv(cityState)) {
                     cityState.threateningBarbarianKilledBy(civUnit.getCivInfo())
                 }
             }