github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Xmage 1.4.16v2

Browse source
This commit is contained in:
LevelX2 2016-10-09 00:13:01 +02:00
parent 4ec7d626fa
commit f92e827d3b
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Mage.Common/src/mage/remote/SessionImpl.java
View file

@ -676,8 +676,10 @@ public class SessionImpl implements Session {
try { try {
if (isConnected()) { if (isConnected()) {
// Workaround to fix Can't join table problem // Workaround to fix Can't join table problem
deckList.setCardLayout(null); if (deckList != null) {
deckList.setSideboardLayout(null); deckList.setCardLayout(null);
deckList.setSideboardLayout(null);
}
return server.joinTable(sessionId, roomId, tableId, playerName, playerType, skill, deckList, password); return server.joinTable(sessionId, roomId, tableId, playerName, playerType, skill, deckList, password);
} }
} catch (InvalidDeckException iex) { } catch (InvalidDeckException iex) {
@ -697,8 +699,10 @@ public class SessionImpl implements Session {
try { try {
if (isConnected()) { if (isConnected()) {
// Workaround to fix Can't join table problem // Workaround to fix Can't join table problem
deckList.setCardLayout(null); if (deckList != null) {
deckList.setSideboardLayout(null); deckList.setCardLayout(null);
deckList.setSideboardLayout(null);
}
return server.joinTournamentTable(sessionId, roomId, tableId, playerName, playerType, skill, deckList, password); return server.joinTournamentTable(sessionId, roomId, tableId, playerName, playerType, skill, deckList, password);
} }
} catch (GameException ex) { } catch (GameException ex) {
@ -1182,8 +1186,10 @@ public class SessionImpl implements Session {
try { try {
if (isConnected()) { if (isConnected()) {
// Workaround to fix Can't join table problem // Workaround to fix Can't join table problem
deck.setCardLayout(null); if (deck != null) {
deck.setSideboardLayout(null); deck.setCardLayout(null);
deck.setSideboardLayout(null);
}
return server.submitDeck(sessionId, tableId, deck); return server.submitDeck(sessionId, tableId, deck);
} }
} catch (GameException ex) { } catch (GameException ex) {
@ -1200,8 +1206,10 @@ public class SessionImpl implements Session {
public boolean updateDeck(UUID tableId, DeckCardLists deck) { public boolean updateDeck(UUID tableId, DeckCardLists deck) {
try { try {
if (isConnected()) { if (isConnected()) {
deck.setCardLayout(null); if (deck != null) {
deck.setSideboardLayout(null); deck.setCardLayout(null);
deck.setSideboardLayout(null);
}
server.updateDeck(sessionId, tableId, deck); server.updateDeck(sessionId, tableId, deck);
return true; return true;
} }

2
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 16; public final static int MAGE_VERSION_PATCH = 16;
public final static String MAGE_VERSION_MINOR_PATCH = "v1"; public final static String MAGE_VERSION_MINOR_PATCH = "v2";
public final static String MAGE_VERSION_INFO = ""; public final static String MAGE_VERSION_INFO = "";
private final int major; private final int major;