external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixturns' into 'master'

Browse Source 
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
parent c141462432 e223fa2002
commit 5ee94199bb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -847,6 +847,9 @@ public class PhaseHandler implements java.io.Serializable {
game.getTriggerHandler().resetTurnTriggerState(); game.getTriggerHandler().resetTurnTriggerState();
Player next = getNextActivePlayer(); Player next = getNextActivePlayer();
while (next.hasLost()) {
next = getNextActivePlayer();
}
game.getTriggerHandler().handlePlayerDefinedDelTriggers(next); game.getTriggerHandler().handlePlayerDefinedDelTriggers(next);