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

Added a quit match option. FFA game gets no more killed if host left mage or quitted match.

Browse source
This commit is contained in:
LevelX2 2013-07-02 22:15:49 +02:00
parent ec9bb538ed
commit 7b260c960b
15 changed files with 178 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage/src/mage/game/GameImpl.java
View file

@ -417,7 +417,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
player.won(this);
}
}
state.endGame();
end();
endTime = new Date();
return true;
}
@ -736,9 +736,11 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
@Override
public void end() {
state.endGame();
for (Player player: state.getPlayers().values()) {
player.abort();
if (!state.isGameOver()) {
state.endGame();
for (Player player: state.getPlayers().values()) {
player.abort();
}
}
}
@ -797,8 +799,8 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
public synchronized void quit(UUID playerId) {
Player player = state.getPlayer(playerId);
if (player != null) {
leave(playerId);
fireInformEvent(player.getName() + " has left the game.");
player.quit(this);
fireInformEvent(player.getName() + " has quitted the match.");
}
}
@ -1580,9 +1582,12 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
@Override
public synchronized void leave(UUID playerId) {
Player player = getPlayer(playerId);
if (player.hasLeft()) {
return;
}
player.leave();
if (this.isGameOver()) {
// no need to remove objects if only one player is left
// no need to remove objects if only one player is left so the game is over
return;
}
//20100423 - 800.4a