github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5146 from spjspj/master

Browse source 
Hopefully fix the /fix command ..
This commit is contained in:
spjspj 2018-07-13 01:01:57 +10:00 committed by GitHub
commit f21543ff8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -1,4 +1,3 @@
package mage.server.game; package mage.server.game;
import java.io.*; import java.io.*;
@ -1149,7 +1148,7 @@ public class GameController implements GameCallback {
sb.append(state.getTurnMods()); sb.append(state.getTurnMods());
sb.append("<br>getTurnNum: "); sb.append("<br>getTurnNum: ");
sb.append(state.getTurnNum()); sb.append(state.getTurnNum());
sb.append("<br>Using plane chase?:" + state.isPlaneChase()); sb.append("<br>Using plane chase?:" + state.isPlaneChase());
if (state.isPlaneChase()) { if (state.isPlaneChase()) {
Plane currentPlane = state.getCurrentPlane(); Plane currentPlane = state.getCurrentPlane();
@ -1157,7 +1156,7 @@ public class GameController implements GameCallback {
sb.append("<br>Current plane:" + currentPlane.getName()); sb.append("<br>Current plane:" + currentPlane.getName());
} }
} }
sb.append("<br>Future Timeout:"); sb.append("<br>Future Timeout:");
if (futureTimeout != null) { if (futureTimeout != null) {
sb.append("Cancelled?="); sb.append("Cancelled?=");
@ -1188,8 +1187,13 @@ public class GameController implements GameCallback {
sb.append("<br>Active player is: "); sb.append("<br>Active player is: ");
sb.append(game.getPlayer(state.getActivePlayerId()).getName()); sb.append(game.getPlayer(state.getActivePlayerId()).getName());
PassAbility pass = new PassAbility(); PassAbility pass = new PassAbility();
if (game.getPlayer(state.getActivePlayerId()).hasLeft()) { if (game.getPlayer(state.getActivePlayerId()).hasLeft()) {
Player p = game.getPlayer(state.getActivePlayerId());
if (p != null) {
p.concede(game);
}
Phase currentPhase = game.getPhase(); Phase currentPhase = game.getPhase();
if (currentPhase != null) { if (currentPhase != null) {
currentPhase.getStep().skipStep(game, state.getActivePlayerId()); currentPhase.getStep().skipStep(game, state.getActivePlayerId());
@ -1204,6 +1208,10 @@ public class GameController implements GameCallback {
sb.append("<br>getChoosingPlayerId: "); sb.append("<br>getChoosingPlayerId: ");
if (state.getChoosingPlayerId() != null) { if (state.getChoosingPlayerId() != null) {
if (game.getPlayer(state.getChoosingPlayerId()).hasLeft()) { if (game.getPlayer(state.getChoosingPlayerId()).hasLeft()) {
Player p = game.getPlayer(state.getChoosingPlayerId());
if (p != null) {
p.concede(game);
}
Phase currentPhase = game.getPhase(); Phase currentPhase = game.getPhase();
if (currentPhase != null && !fixedAlready) { if (currentPhase != null && !fixedAlready) {
currentPhase.getStep().endStep(game, state.getActivePlayerId()); currentPhase.getStep().endStep(game, state.getActivePlayerId());
@ -1218,7 +1226,11 @@ public class GameController implements GameCallback {
sb.append("<br><font color=orange>Player with Priority is: "); sb.append("<br><font color=orange>Player with Priority is: ");
if (state.getPriorityPlayerId() != null) { if (state.getPriorityPlayerId() != null) {
if (game.getPlayer(state.getPriorityPlayerId()).hasLeft()) { if (game.getPlayer(state.getPriorityPlayerId()).hasLeft()) {
Player p = game.getPlayer(state.getPriorityPlayerId());
if (p != null) {
p.concede(game);
}
Phase currentPhase = game.getPhase(); Phase currentPhase = game.getPhase();
if (currentPhase != null && !fixedAlready) { if (currentPhase != null && !fixedAlready) {
currentPhase.getStep().skipStep(game, state.getActivePlayerId()); currentPhase.getStep().skipStep(game, state.getActivePlayerId());
@ -1228,7 +1240,7 @@ public class GameController implements GameCallback {
} }
sb.append(game.getPlayer(state.getPriorityPlayerId()).getName()); sb.append(game.getPlayer(state.getPriorityPlayerId()).getName());
sb.append("</font>"); sb.append("</font>");
} }
sb.append("<br>Future Timeout:"); sb.append("<br>Future Timeout:");
if (futureTimeout != null) { if (futureTimeout != null) {