From c4ad51c4af2467f3483204e29f23b76c53f8f880 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 27 Dec 2014 03:52:07 +0100 Subject: [PATCH] * Tournament password - Fixed that the dialog to enter the password was not opened. --- Mage.Client/src/main/java/mage/client/table/TablesPanel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 4fd6a15521..bda01c53ea 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -148,7 +148,7 @@ public class TablesPanel extends javax.swing.JPanel { UUID gameId = (UUID)tableModel.getValueAt(modelRow, TableTableModel.ACTION_COLUMN + 2); String action = (String)tableModel.getValueAt(modelRow, TableTableModel.ACTION_COLUMN); String deckType = (String)tableModel.getValueAt(modelRow, TableTableModel.COLUMN_DECK_TYPE); - String info = (String)tableModel.getValueAt(modelRow, TableTableModel.COLUMN_INFO); + String status = (String)tableModel.getValueAt(modelRow, TableTableModel.COLUMN_STATUS); boolean isTournament = (Boolean)tableModel.getValueAt(modelRow, TableTableModel.ACTION_COLUMN + 1); String owner = (String)tableModel.getValueAt(modelRow, 1); switch (action) { @@ -177,7 +177,7 @@ public class TablesPanel extends javax.swing.JPanel { if (isTournament) { logger.info("Joining tournament " + tableId); if (deckType.startsWith("Limited")) { - if (!info.startsWith("PW")) { + if (!status.endsWith("PW")) { session.joinTournamentTable(roomId, tableId, session.getUserName(), "Human", 1, null, ""); } else { joinTableDialog.showDialog(roomId, tableId, true, deckType.startsWith("Limited")); @@ -712,6 +712,7 @@ class TableTableModel extends AbstractTableModel { public static final int COLUMN_DECK_TYPE = 0; // column the deck type is located (starting with 0) Start string is used to check for Limited public static final int COLUMN_INFO = 3; + public static final int COLUMN_STATUS = 4; public static final int ACTION_COLUMN = 6; // column the action is located (starting with 0) private final String[] columnNames = new String[]{"Deck Type", "Owner / Players", "Game Type", "Info", "Status", "Created / Started", "Action"};