External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 20:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Changed logging level back to info, changed level of a lot of messages to debug from info. Added check that certain AI players can't join a table with no appropriate format.

Browse source
This commit is contained in:
LevelX2 2013-10-09 15:22:40 +02:00
parent 7a4469fd80
commit d34779fa68
26 changed files with 146 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
View file

@ -339,7 +339,7 @@ public class NewTableDialog extends MageDialog {
for (TablePlayerPanel player: players) {
if (!player.getPlayerType().equals("Human")) {
if (!player.joinTable(roomId, table.getTableId())) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Error joining table.", "Error", JOptionPane.ERROR_MESSAGE);
// error message must be send by the server
session.removeTable(roomId, table.getTableId());
table = null;
return;

4
Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form
View file

@ -113,7 +113,7 @@
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="pnlPacks" pref="67" max="32767" attributes="0"/>
<Component id="pnlPacks" pref="69" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
@ -124,7 +124,7 @@
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Component id="spnNumPlayers" pref="23" max="32767" attributes="1"/>
<Component id="spnNumPlayers" pref="25" max="32767" attributes="1"/>
<Component id="pnlDraftOptions" max="32767" attributes="1"/>
</Group>
<EmptySpace min="-2" pref="14" max="-2" attributes="0"/>

2
Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
View file

@ -401,7 +401,7 @@ public class NewTournamentDialog extends MageDialog {
for (TournamentPlayerPanel player: players) {
if (!player.getPlayerType().toString().equals("Human")) {
if (!player.joinTournamentTable(roomId, table.getTableId())) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Error joining tournament.", "Error", JOptionPane.ERROR_MESSAGE);
// error message must be send by sever
session.removeTable(roomId, table.getTableId());
table = null;
return;