github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-09 09:11:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

Prevent that the tournament sub tables are deleted by expire check (delete logik must be added).

Browse source
This commit is contained in:
LevelX2 2013-07-15 15:03:38 +02:00
parent f1ce18cccf
commit ded726d2ef
3 changed files with 12 additions and 3 deletions
Mage.Server/src/main/java/mage/server
TableManager.java
tournament
TournamentController.java
Mage/src/mage/game
Table.java

4
Mage.Server/src/main/java/mage/server/TableManager.java
View file

@ -319,8 +319,8 @@ public class TableManager {
if (player != null && player.isHuman()) { if (player != null && player.isHuman()) {
canBeRemoved = false; canBeRemoved = false;
} }
/* temporarily fix for issue #262 */ // tournament sub tables may not be removed, will be done by the tournament itself
if(table.getGameType().equals("Two Player Duel")){ if(table.isTournamentSubTable()){
canBeRemoved = false; canBeRemoved = false;
} }
} }

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

@ -196,6 +196,7 @@ public class TournamentController {
try { try {
TableManager tableManager = TableManager.getInstance(); TableManager tableManager = TableManager.getInstance();
Table table = tableManager.createTable(GamesRoomManager.getInstance().getMainRoomId(), matchOptions); Table table = tableManager.createTable(GamesRoomManager.getInstance().getMainRoomId(), matchOptions);
table.setTournamentSubTable(true);
TournamentPlayer player1 = pair.getPlayer1(); TournamentPlayer player1 = pair.getPlayer1();
TournamentPlayer player2 = pair.getPlayer2(); TournamentPlayer player2 = pair.getPlayer2();
tableManager.addPlayer(getPlayerSessionId(player1.getPlayer().getId()), table.getId(), player1.getPlayer(), player1.getPlayerType(), player1.getDeck()); tableManager.addPlayer(getPlayerSessionId(player1.getPlayer().getId()), table.getId(), player1.getPlayer(), player1.getPlayerType(), player1.getDeck());

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

@ -56,7 +56,7 @@ public class Table implements Serializable {
private Seat[] seats; private Seat[] seats;
private int numSeats; private int numSeats;
private boolean isTournament; private boolean isTournament;
private boolean isTournamentSubTable; private boolean tournamentSubTable;
private DeckValidator validator; private DeckValidator validator;
private TableState state = TableState.WAITING; private TableState state = TableState.WAITING;
private Match match; private Match match;
@ -227,4 +227,12 @@ public class Table implements Serializable {
return controllerName; return controllerName;
} }
public boolean isTournamentSubTable() {
return tournamentSubTable;
}
public void setTournamentSubTable(boolean tournamentSubTable) {
this.tournamentSubTable = tournamentSubTable;
}
} }