From b4bc02839f7a36cf929ffc13dbfe2c3f634bbb76 Mon Sep 17 00:00:00 2001
From: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com>
Date: Mon, 23 Jun 2025 22:18:48 +0200
Subject: [PATCH] Update CivilianUnitAutomation.kt (#13503)

---
 .../unciv/logic/automation/unit/CivilianUnitAutomation.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt
index 7071b86693..24e3b90f94 100644
--- a/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt
@@ -111,9 +111,9 @@ object CivilianUnitAutomation {
         // TODO: This could be more complex to walk to the city state that is most beneficial to
         //  also have more influence.
         if (unit.hasUnique(UniqueType.CanTradeWithCityStateForGoldAndInfluence)
-            // Don't wander around with the great merchant when at war. Barbs might also be a
-            // problem, but hopefully by the time we have a great merchant, they're under control.
-            && !unit.civ.isAtWar()
+            // There's a risk our merchant gets intercepted and killed by the enemy during war.
+            // If such happens, it is a failure of our military unit movement to protect our merchant.
+            // Barbs might also be a problem, but hopefully by the time we have a great merchant, they're under control.
             && isLateGame
         ) {
             val tradeMissionCanBeConductedEventually =