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

Fixed NPE if non tournament player submits a deck.

Browse source
This commit is contained in:
LevelX2 2013-07-19 19:14:33 +02:00
parent 57bec7a0c1
commit a7a023b5c1
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,9 +217,18 @@ 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.isTournament()) {
TournamentPlayer player = tournament.getPlayer(playerId);
if (player.hasQuit()) {
return true; // so the construct panel closes after submit
}
} else {
if (table.getMatch() != null) {
MatchPlayer mPlayer = table.getMatch().getPlayer(playerId);
if (mPlayer.hasQuit()) {
return true; // so the construct panel closes after submit
}
}
}
if (table.getState() != TableState.SIDEBOARDING && table.getState() != TableState.CONSTRUCTING) {
return false;