From c29617c80a3eb05028da8a6ac298e01af13a702e Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Sun, 9 Mar 2025 14:04:56 +0200
Subject: [PATCH] "Never appears as a Barbarian unit" also affects upgrades

---
 core/src/com/unciv/logic/automation/unit/UnitAutomation.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
index 15845038af..f608fdfebf 100644
--- a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
@@ -156,6 +156,8 @@ object UnitAutomation {
         fun isInvalidUpgradeDestination(baseUnit: BaseUnit): Boolean {
             if (!unit.civ.tech.isResearched(baseUnit))
                 return true
+            if (unit.civ.isBarbarian && baseUnit.hasUnique(UniqueType.CannotBeBarbarian))
+                return true
             return baseUnit.getMatchingUniques(UniqueType.OnlyAvailable, StateForConditionals.IgnoreConditionals)
                 .any { !it.conditionalsApply(unit.cache.state) }
         }