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

Started fixing that match does not end, if player left mage during sideboarding (not finished yet).

Browse source
This commit is contained in:
LevelX2 2013-07-23 17:23:47 +02:00
parent 94109b5e2e
commit 1016decf07
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/mage/game/Table.java
View file

@ -186,9 +186,13 @@ public class Table implements Serializable {
for (int i = 0; i < numSeats; i++ ) { for (int i = 0; i < numSeats; i++ ) {
Player player = seats[i].getPlayer(); Player player = seats[i].getPlayer();
if (player != null && player.getId().equals(playerId)) { if (player != null && player.getId().equals(playerId)) {
seats[i].setPlayer(null); if (match != null) {
if (state == TableState.STARTING) { match.leave(playerId);
state = TableState.WAITING; } else {
seats[i].setPlayer(null);
if (state == TableState.STARTING) {
state = TableState.WAITING;
}
} }
break; break;
} }

6
Mage/src/mage/game/match/MatchImpl.java
View file

@ -90,7 +90,11 @@ public abstract class MatchImpl implements Match {
public boolean leave(UUID playerId) { public boolean leave(UUID playerId) {
MatchPlayer mPlayer = getPlayer(playerId); MatchPlayer mPlayer = getPlayer(playerId);
if (mPlayer != null) { if (mPlayer != null) {
return players.remove(mPlayer); boolean result = players.remove(mPlayer);
synchronized (this) {
this.notifyAll();
}
return result;
} }
return false; return false;
} }