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

* Table handling - Fixed a bug that if table owner tried to create a table with invalid deck, the table was added to the finished tables with no players.

Browse source
This commit is contained in:
LevelX2 2014-09-19 13:37:59 +02:00
parent f4b4184d99
commit a57ebc5314
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
View file

@ -258,12 +258,8 @@ public class TableWaitingDialog extends MageDialog {
private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed
try {
if (session.isTableOwner(roomId, tableId)) {
session.removeTable(roomId, tableId);
} else {
if (!session.leaveTable(roomId, tableId)) {
return; // already started, so leave no more possible
}
if (!session.leaveTable(roomId, tableId)) {
return; // already started, so leave no more possible
}
} catch (Exception e) {
//swallow exception

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

@ -231,6 +231,10 @@ public class TableController {
}
sb.append("\n\nSelect a deck that is appropriate for the selected format and try again!");
user.showUserMessage("Join Table", sb.toString());
if (isOwner(userId)) {
logger.debug("New table removed because owner submitted invalid deck tableId " + table.getId());
TableManager.getInstance().removeTable(table.getId());
}
return false;
}

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

@ -136,7 +136,9 @@ public class Table implements Serializable {
*
*/
public void closeTable() {
setState(TableState.FINISHED);
if (!getState().equals(TableState.WAITING) && !getState().equals(TableState.READY_TO_START)) {
setState(TableState.FINISHED); // otherwise the table can be removed completely
}
this.validator = null;
}