External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki 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

4
Mage/src/main/java/mage/game/Game.java
View file

@ -173,7 +173,7 @@ public interface Game extends MageItem, Serializable {
UUID getPriorityPlayerId();
boolean gameOver(UUID playerId);
boolean checkIfGameIsOver();
boolean hasEnded();
@ -347,6 +347,8 @@ public interface Game extends MageItem, Serializable {
void concede(UUID playerId);
void setConcedingPlayer(UUID playerId);
void setManaPaymentMode(UUID playerId, boolean autoPayment);
void setManaPaymentModeRestricted(UUID playerId, boolean autoPaymentRestricted);

99
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -161,6 +161,8 @@ public abstract class GameImpl implements Game, Serializable {
private final LinkedList<UUID> stackObjectsCheck = new LinkedList<>(); // used to check if different sources used the stack
// used to set the counters a permanent adds the battlefield (if no replacement effect is used e.g. Persist)
protected Map<UUID, Counters> enterWithCounters = new HashMap<>();
// used to proceed player conceding requests
private final LinkedList<UUID> concedingPlayers = new LinkedList<>(); // used to handle asynchronous request of a player to leave the game
public GameImpl(MultiplayerAttackOption attackOption, RangeOfInfluence range, int freeMulligans, int startLife) {
this.id = UUID.randomUUID();
@ -535,26 +537,58 @@ public abstract class GameImpl implements Game, Serializable {
}
}
/**
* Starts check if game is over or if playerId is given let the player
* concede.
*
* @param playerId
* @return
*/
// /**
// * Starts check if game is over or if playerId is given let the player
// * concede.
// *
// * @param playerId
// * @return
// */
// @Override
// public synchronized boolean gameOver(UUID playerId) {
// if (playerId == null) {
// boolean result = checkIfGameIsOver();
// return result;
// } else {
// logger.debug("Game over for player Id: " + playerId + " gameId " + getId());
// concedingPlayers.add(playerId);
// Player player = getPlayer(state.getPriorityPlayerId());
// if (player != null && player.isHuman()) {
// player.signalPlayerConcede();
// } else {
// checkConcede();
// }
// return true;
// }
// }
@Override
public synchronized boolean gameOver(UUID playerId) {
if (playerId == null) {
boolean result = checkIfGameIsOver();
return result;
public void setConcedingPlayer(UUID playerId) {
Player player = getPlayer(state.getPriorityPlayerId());
if (player != null) {
if (!player.hasLeft() && player.isHuman()) {
if (!concedingPlayers.contains(playerId)) {
logger.debug("Game over for player Id: " + playerId + " gameId " + getId());
concedingPlayers.add(playerId);
player.signalPlayerConcede();
}
} else {
// no asynchronous action so check directly
checkConcede();
}
} else {
logger.debug("Game over for player Id: " + playerId + " gameId " + getId());
leave(playerId);
return true;
checkConcede();
checkIfGameIsOver();
}
}
private boolean checkIfGameIsOver() {
public void checkConcede() {
while (!concedingPlayers.isEmpty()) {
leave(concedingPlayers.removeFirst());
}
}
@Override
public boolean checkIfGameIsOver() {
if (state.isGameOver()) {
return true;
}
@ -578,7 +612,7 @@ public abstract class GameImpl implements Game, Serializable {
}
for (Player player : state.getPlayers().values()) {
if (!player.hasLeft() && !player.hasLost()) {
logger.debug(new StringBuilder("Player ").append(player.getName()).append(" has won gameId: ").append(this.getId()));
logger.debug("Player " + player.getName() + " has won gameId: " + this.getId());
player.won(this);
}
}
@ -696,13 +730,13 @@ public abstract class GameImpl implements Game, Serializable {
Player player = getPlayer(playerList.get());
boolean wasPaused = state.isPaused();
state.resume();
if (!gameOver(null)) {
if (!checkIfGameIsOver()) {
fireInformEvent("Turn " + state.getTurnNum());
if (checkStopOnTurnOption()) {
return;
}
state.getTurn().resumePlay(this, wasPaused);
if (!isPaused() && !gameOver(null)) {
if (!isPaused() && !checkIfGameIsOver()) {
endOfTurn();
player = playerList.getNext(this);
state.setTurnNum(state.getTurnNum() + 1);
@ -712,11 +746,11 @@ public abstract class GameImpl implements Game, Serializable {
}
protected void play(UUID nextPlayerId) {
if (!isPaused() && !gameOver(null)) {
if (!isPaused() && !checkIfGameIsOver()) {
playerList = state.getPlayerList(nextPlayerId);
Player playerByOrder = getPlayer(playerList.get());
state.setPlayerByOrderId(playerByOrder.getId());
while (!isPaused() && !gameOver(null)) {
while (!isPaused() && !checkIfGameIsOver()) {
if (!playExtraTurns()) {
break;
}
@ -733,7 +767,7 @@ public abstract class GameImpl implements Game, Serializable {
state.setPlayerByOrderId(playerByOrder.getId());
}
}
if (gameOver(null) && !isSimulation()) {
if (checkIfGameIsOver() && !isSimulation()) {
winnerId = findWinnersAndLosers();
StringBuilder sb = new StringBuilder("GAME END gameId: ").append(this.getId()).append(' ');
int count = 0;
@ -816,7 +850,7 @@ public abstract class GameImpl implements Game, Serializable {
skipTurn = state.getTurn().play(this, player);
} while (executingRollback);
if (isPaused() || gameOver(null)) {
if (isPaused() || checkIfGameIsOver()) {
return false;
}
if (!skipTurn) {
@ -854,7 +888,7 @@ public abstract class GameImpl implements Game, Serializable {
saveState(false);
if (gameOver(null)) {
if (checkIfGameIsOver()) {
return;
}
@ -1245,7 +1279,7 @@ public abstract class GameImpl implements Game, Serializable {
clearAllBookmarks();
try {
applyEffects();
while (!isPaused() && !gameOver(null) && !this.getTurn().isEndTurnRequested()) {
while (!isPaused() && !checkIfGameIsOver() && !this.getTurn().isEndTurnRequested()) {
if (!resuming) {
state.getPlayers().resetPassed();
state.getPlayerList().setCurrent(activePlayerId);
@ -1254,14 +1288,14 @@ public abstract class GameImpl implements Game, Serializable {
}
fireUpdatePlayersEvent();
Player player;
while (!isPaused() && !gameOver(null)) {
while (!isPaused() && !checkIfGameIsOver()) {
try {
if (bookmark == 0) {
bookmark = bookmarkState();
}
player = getPlayer(state.getPlayerList().get());
state.setPriorityPlayerId(player.getId());
while (!player.isPassed() && player.canRespond() && !isPaused() && !gameOver(null)) {
while (!player.isPassed() && player.canRespond() && !isPaused() && !checkIfGameIsOver()) {
if (!resuming) {
// 603.3. Once an ability has triggered, its controller puts it on the stack as an object that's not a card the next time a player would receive priority
checkStateAndTriggered();
@ -1270,7 +1304,7 @@ public abstract class GameImpl implements Game, Serializable {
resetLKI();
}
saveState(false);
if (isPaused() || gameOver(null)) {
if (isPaused() || checkIfGameIsOver()) {
return;
}
// resetPassed should be called if player performs any action
@ -1289,13 +1323,14 @@ public abstract class GameImpl implements Game, Serializable {
}
resetShortLivingLKI();
resuming = false;
if (isPaused() || gameOver(null)) {
if (isPaused() || checkIfGameIsOver()) {
return;
}
if (allPassed()) {
if (!state.getStack().isEmpty()) {
//20091005 - 115.4
resolve();
checkConcede();
applyEffects();
state.getPlayers().resetPassed();
fireUpdatePlayersEvent();
@ -1609,11 +1644,11 @@ public abstract class GameImpl implements Game, Serializable {
public boolean checkStateAndTriggered() {
boolean somethingHappened = false;
//20091005 - 115.5
while (!isPaused() && !gameOver(null)) {
while (!isPaused() && !checkIfGameIsOver()) {
if (!checkStateBasedActions()) {
// nothing happened so check triggers
state.handleSimultaneousEvent(this);
if (isPaused() || gameOver(null) || getTurn().isEndTurnRequested() || !checkTriggered()) {
if (isPaused() || checkIfGameIsOver() || getTurn().isEndTurnRequested() || !checkTriggered()) {
break;
}
}
@ -1621,6 +1656,7 @@ public abstract class GameImpl implements Game, Serializable {
applyEffects(); // needed e.g if boost effects end and cause creatures to die
somethingHappened = true;
}
checkConcede();
return somethingHappened;
}
@ -1734,7 +1770,6 @@ public abstract class GameImpl implements Game, Serializable {
}
}
List<Permanent> planeswalkers = new ArrayList<>();
List<Permanent> legendary = new ArrayList<>();
List<Permanent> worldEnchantment = new ArrayList<>();
for (Permanent perm : getBattlefield().getAllActivePermanents()) {
@ -1781,7 +1816,6 @@ public abstract class GameImpl implements Game, Serializable {
continue;
}
}
planeswalkers.add(perm);
}
if (perm.isWorld()) {
worldEnchantment.add(perm);
@ -2288,7 +2322,6 @@ public abstract class GameImpl implements Game, Serializable {
* @param playerId
*/
protected void leave(UUID playerId) { // needs to be executed from the game thread, not from the concede thread of conceding player!
Player player = getPlayer(playerId);
if (player == null || player.hasLeft()) {
logger.debug("Player already left " + (player != null ? player.getName() : playerId));

4
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -264,7 +264,7 @@ public class Combat implements Serializable, Copyable<Combat> {
player.selectAttackers(game, attackingPlayerId);
}
firstTime = false;
if (game.isPaused() || game.gameOver(null) || game.executingRollback()) {
if (game.isPaused() || game.checkIfGameIsOver() || game.executingRollback()) {
return;
}
// because of possible undo during declare attackers it's neccassary to call here the methods with "game.getCombat()." to get the current combat object!!!
@ -461,7 +461,7 @@ public class Combat implements Serializable, Copyable<Combat> {
}
while (choose) {
controller.selectBlockers(game, defenderId);
if (game.isPaused() || game.gameOver(null) || game.executingRollback()) {
if (game.isPaused() || game.checkIfGameIsOver() || game.executingRollback()) {
return;
}
if (!game.getCombat().checkBlockRestrictions(defender, game)) {

20
Mage/src/main/java/mage/game/turn/Phase.java
View file

@ -95,7 +95,7 @@ public abstract class Phase implements Serializable {
}
public boolean play(Game game, UUID activePlayerId) {
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
@ -104,7 +104,7 @@ public abstract class Phase implements Serializable {
if (beginPhase(game, activePlayerId)) {
for (Step step : steps) {
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
if (game.getTurn().isEndTurnRequested() && step.getType()!=PhaseStep.CLEANUP) {
@ -122,7 +122,7 @@ public abstract class Phase implements Serializable {
}
}
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
count++;
@ -143,7 +143,7 @@ public abstract class Phase implements Serializable {
}
public boolean resumePlay(Game game, PhaseStep stepType, boolean wasPaused) {
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
@ -157,7 +157,7 @@ public abstract class Phase implements Serializable {
resumeStep(game, wasPaused);
while (it.hasNext()) {
step = it.next();
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
currentStep = step;
@ -169,7 +169,7 @@ public abstract class Phase implements Serializable {
}
}
if (game.isPaused() || game.gameOver(null)) {
if (game.isPaused() || game.checkIfGameIsOver()) {
return false;
}
count++;
@ -206,13 +206,13 @@ public abstract class Phase implements Serializable {
if (!currentStep.skipStep(game, activePlayerId)) {
game.getState().increaseStepNum();
prePriority(game, activePlayerId);
if (!game.isPaused() && !game.gameOver(null) && !game.executingRollback()) {
if (!game.isPaused() && !game.checkIfGameIsOver() && !game.executingRollback()) {
currentStep.priority(game, activePlayerId, false);
if (game.executingRollback()) {
return;
}
}
if (!game.isPaused() && !game.gameOver(null) && !game.executingRollback()) {
if (!game.isPaused() && !game.checkIfGameIsOver() && !game.executingRollback()) {
postPriority(game, activePlayerId);
}
}
@ -233,11 +233,11 @@ public abstract class Phase implements Serializable {
prePriority(game, activePlayerId);
}
case PRIORITY:
if (!game.isPaused() && !game.gameOver(null)) {
if (!game.isPaused() && !game.checkIfGameIsOver()) {
currentStep.priority(game, activePlayerId, resuming);
}
case POST:
if (!game.isPaused() && !game.gameOver(null)) {
if (!game.isPaused() && !game.checkIfGameIsOver()) {
postPriority(game, activePlayerId);
}
}

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;

2
Mage/src/main/java/mage/players/Player.java
View file

@ -444,6 +444,8 @@ public interface Player extends MageItem, Copyable<Player> {
void abortReset();
void signalPlayerConcede();
void skip();
// priority, undo, ...

13
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -2039,9 +2039,9 @@ public abstract class PlayerImpl implements Player, Serializable {
@Override
public void concede(Game game) {
game.gameOver(playerId);
game.setConcedingPlayer(playerId);
lost(game);
this.left = true;
// this.left = true;
}
@Override
@ -2136,7 +2136,7 @@ public abstract class PlayerImpl implements Player, Serializable {
// for draw - first all players that have lost have to be set to lost
if (!hasLeft()) {
logger.debug("Game over playerId: " + playerId);
game.gameOver(playerId);
game.setConcedingPlayer(playerId);
}
}
@ -2197,7 +2197,7 @@ public abstract class PlayerImpl implements Player, Serializable {
this.draws = true;
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DRAW_PLAYER, null, null, playerId));
game.informPlayers("For " + this.getLogName() + " the game is a draw.");
game.gameOver(playerId);
game.setConcedingPlayer(playerId);
}
}
@ -3578,6 +3578,11 @@ public abstract class PlayerImpl implements Player, Serializable {
abort = false;
}
@Override
public void signalPlayerConcede() {
}
@Override
public boolean scry(int value, Ability source,
Game game