Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed player leaving/conceding handling.

Browse source
This commit is contained in:
LevelX2 2017-10-21 16:13:45 +02:00
parent 79d4c07d20
commit 58d3fc2328
21 changed files with 553 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/game/turn/Turn.java
View file

@ -127,7 +127,7 @@ public class Turn implements Serializable {
public boolean play(Game game, Player activePlayer) {
activePlayer.becomesActivePlayer();
this.setDeclareAttackersStepStarted(false);
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
@ -143,7 +143,7 @@ public class Turn implements Serializable {
resetCounts();
game.getPlayer(activePlayer.getId()).beginTurn(game);
for (Phase phase : phases) {
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
if (!isEndTurnRequested() || phase.getType() == TurnPhase.END) {
@ -189,7 +189,7 @@ public class Turn implements Serializable {
}
while (it.hasNext()) {
phase = it.next();
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return;
}
currentPhase = phase;