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

Partial Rollback

Browse Source
This commit is contained in:
tool4EvEr
2021-01-13 19:38:05 +01:00
parent e69abf0982
commit afce0b1af4
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,10 +127,6 @@ public class PhaseHandler implements java.io.Serializable {
game.updatePlayerTurnForView(); game.updatePlayerTurnForView();
setPriority(playerTurn); setPriority(playerTurn);
} }
public final void endPlayerLostTurn() {
setPlayerTurn(handleNextTurn());
}
public final Player getPriorityPlayer() { public final Player getPriorityPlayer() {
return pPlayerPriority; return pPlayerPriority;

8
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -2943,13 +2943,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
} }
public void autoPassUntilEndOfTurn() { public void autoPassUntilEndOfTurn() {
// if we already conceded just skip everything getGui().autoPassUntilEndOfTurn(getLocalPlayerView());
if (player.getOutcome() != null) {
player.getGame().getPhaseHandler().endPlayerLostTurn();
}
else {
getGui().autoPassUntilEndOfTurn(getLocalPlayerView());
}
} }
@Override @Override