From f8f44320ae6a41763b569010a363d582dd2f7cb8 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 6 Feb 2020 22:51:26 +0200 Subject: [PATCH] Resolved #1859 - skip defeated players' turns in multiplayer --- core/src/com/unciv/logic/GameInfo.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 8ac1c5cf33..f4037f95ca 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -82,8 +82,11 @@ class GameInfo { while (thisPlayer.playerType == PlayerType.AI || UncivGame.Current.simulateUntilTurnForDebug > turns + // For multiplayer, if there are 3+ players and one is defeated, + // we'll want to skip over their turn + || thisPlayer.isDefeated() ) { - if(thisPlayer.isBarbarian() || !thisPlayer.isDefeated()) { + if (!thisPlayer.isDefeated() || thisPlayer.isBarbarian()) { NextTurnAutomation().automateCivMoves(thisPlayer) // Placing barbarians after their turn