From e223fa2002e2a206d2c81c4d1c9c167c0feef5b8 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Thu, 6 May 2021 21:39:24 +0200 Subject: [PATCH] Fix extra turns deadlock --- forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java index 009b1a1fc22..a8ddf9a1ea7 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -847,6 +847,9 @@ public class PhaseHandler implements java.io.Serializable { game.getTriggerHandler().resetTurnTriggerState(); Player next = getNextActivePlayer(); + while (next.hasLost()) { + next = getNextActivePlayer(); + } game.getTriggerHandler().handlePlayerDefinedDelTriggers(next);