From ef1c81bef7fa8364220e642783cc62203723fbdb Mon Sep 17 00:00:00 2001
From: nacro711072 <nacro711072@yahoo.com.tw>
Date: Thu, 27 Oct 2022 15:05:33 +0800
Subject: [PATCH] check whether the city has been a puppet in "Pick
 construction" action. (#7963)

---
 core/src/com/unciv/ui/worldscreen/WorldScreen.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
index bc38cdd1cb..bda4966896 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt
@@ -672,10 +672,16 @@ class WorldScreen(
             viewingCiv.shouldGoToDueUnit() ->
                 NextTurnAction("Next unit", Color.LIGHT_GRAY) { switchToNextUnit() }
 
-            viewingCiv.cities.any { it.cityConstructions.currentConstructionFromQueue == "" } ->
+            viewingCiv.cities.any {
+                !it.isPuppet &&
+                it.cityConstructions.currentConstructionFromQueue == ""
+            } ->
                 NextTurnAction("Pick construction", Color.CORAL) {
                     val cityWithNoProductionSet = viewingCiv.cities
-                        .firstOrNull { it.cityConstructions.currentConstructionFromQueue == "" }
+                        .firstOrNull {
+                            !it.isPuppet &&
+                            it.cityConstructions.currentConstructionFromQueue == ""
+                        }
                     if (cityWithNoProductionSet != null) game.pushScreen(
                         CityScreen(cityWithNoProductionSet)
                     )