Merge branch 'fixturns' into 'master'

Fix multiplayer extra turns deadlock

See merge request core-developers/forge!4665
This commit is contained in:
Anthony Calosa
2021-05-07 00:48:21 +00:00

View File

@@ -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);