fixed replay + some other fixes

This commit is contained in:
BetaSteward 2011-03-18 18:27:01 -04:00
parent ff3e0108cd
commit 35f0767f1b
24 changed files with 218 additions and 187 deletions

View file

@ -32,12 +32,12 @@ import java.io.Serializable;
import java.util.List;
import java.util.UUID;
import mage.Constants.TableState;
import mage.cards.decks.Deck;
import mage.cards.decks.DeckValidator;
import mage.game.events.Listener;
import mage.game.events.TableEvent;
import mage.game.events.TableEvent.EventType;
import mage.game.events.TableEventSource;
import mage.game.match.Match;
import mage.game.tournament.Tournament;
import mage.players.Player;
/**
@ -54,15 +54,28 @@ public class Table implements Serializable {
private boolean isTournament;
private DeckValidator validator;
private TableState state = TableState.WAITING;
private Match match;
private Tournament tournament;
protected TableEventSource tableEventSource = new TableEventSource();
public Table(String gameType, String name, DeckValidator validator, List<String> playerTypes, boolean isTournament) {
public Table(String gameType, String name, DeckValidator validator, List<String> playerTypes, Tournament tournament) {
this(gameType, name, validator, playerTypes);
this.tournament = tournament;
this.isTournament = true;
}
public Table(String gameType, String name, DeckValidator validator, List<String> playerTypes, Match match) {
this(gameType, name, validator, playerTypes);
this.match = match;
this.isTournament = false;
}
protected Table(String gameType, String name, DeckValidator validator, List<String> playerTypes) {
tableId = UUID.randomUUID();
this.numSeats = playerTypes.size();
this.gameType = gameType;
this.name = name;
this.isTournament = isTournament;
createSeats(playerTypes);
this.validator = validator;
}
@ -169,4 +182,12 @@ public class Table implements Serializable {
tableEventSource.addListener(listener);
}
public Match getMatch() {
return match;
}
public Tournament getTournament() {
return tournament;
}
}