github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handling of players that cancel tournament improved.

Browse source
This commit is contained in:
LevelX2 2013-07-19 14:05:56 +02:00
parent 41034ccdd8
commit 6098aa1d7c
5 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Common/src/mage/view/MatchView.java
View file

@ -89,8 +89,12 @@ public class MatchView implements Serializable {
}
this.players = sb1.toString();
StringBuilder sb2 = new StringBuilder();
for (TournamentPlayer tPlayer : table.getTournament().getPlayers()) {
sb2.append(tPlayer.getPlayer().getName()).append(": ").append(tPlayer.getResults()).append(" ");
if (table.getTournament().getRounds().size() > 0) {
for (TournamentPlayer tPlayer : table.getTournament().getPlayers()) {
sb2.append(tPlayer.getPlayer().getName()).append(": ").append(tPlayer.getResults()).append(" ");
}
} else {
sb2.append("Canceled");
}
this.result = sb2.toString();
this.startTime = table.getTournament().getStartTime();

5
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -53,6 +53,7 @@ import mage.game.match.MatchOptions;
import mage.game.match.MatchPlayer;
import mage.game.tournament.Tournament;
import mage.game.tournament.TournamentOptions;
import mage.game.tournament.TournamentPlayer;
import mage.players.Player;
import mage.server.challenge.ChallengeManager;
import mage.server.draft.DraftManager;
@ -216,6 +217,10 @@ public class TableController {
public synchronized boolean submitDeck(UUID userId, DeckCardLists deckList) throws MageException {
UUID playerId = userPlayerMap.get(userId);
TournamentPlayer player = tournament.getPlayer(playerId);
if (player.hasQuit()) {
return true; // so the construct panel closes after submit
}
if (table.getState() != TableState.SIDEBOARDING && table.getState() != TableState.CONSTRUCTING) {
return false;
}

1
Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
View file

@ -275,6 +275,7 @@ public class TournamentController {
info = "during Construction phase";
}
player.setQuit(info);
tournament.quit(playerId);
}
}
}

1
Mage/src/mage/game/tournament/Tournament.java
View file

@ -63,6 +63,7 @@ public interface Tournament {
void autoSubmit(UUID playerId, Deck deck);
boolean allJoined();
boolean isDoneConstructing();
void quit(UUID playerId);
void leave(UUID playerId);
void nextStep();

7
Mage/src/mage/game/tournament/TournamentImpl.java
View file

@ -118,6 +118,13 @@ public abstract class TournamentImpl implements Tournament {
return setsInfoShort;
}
@Override
public void quit(UUID playerId) {
synchronized (this) {
this.notifyAll();
}
}
@Override
public void leave(UUID playerId) {
if (players.containsKey(playerId)) {