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

fixed some bugs + improved some messages

Browse source
This commit is contained in:
betasteward 2015-07-20 21:34:18 -04:00
parent 5c829b79d5
commit 8bff961caf
5 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Common/src/mage/view/TableView.java
View file

@ -63,6 +63,15 @@ public class TableView implements Serializable {
private List<SeatView> seats = new ArrayList<>();
private List<UUID> games = new ArrayList<>();
public static TableView emptyTableView = new TableView();
private TableView() {
deckType = "";
additionalInfo = "";
skillLevel = SkillLevel.BEGINNER;
tableStateText = "Empty";
}
public TableView(Table table) {
this.tableId = table.getId();
this.gameType = table.getGameType();

7
Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
View file

@ -223,7 +223,12 @@ public class ClientMessageHandler extends SimpleChannelInboundHandler<ClientMess
}
public void receiveTableView(TableView view) {
tableViewQueue.offer(view);
if (view == null) {
tableViewQueue.offer(TableView.emptyTableView);
}
else {
tableViewQueue.offer(view);
}
}
public void receiveTournamentView(TournamentView view) {

1
Mage.Server/release/config/config.xml
View file

@ -16,6 +16,7 @@
userNamePattern="[^a-z0-9_]"
maxAiOpponents="15"
saveGameActivated="false"
useSSL="true"
/>
<playerTypes>
<playerType name="Human" jar="mage-player-human-${project.version}.jar" className="mage.player.human.HumanPlayer"/>

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

@ -179,7 +179,7 @@ public class TableController {
deck = Deck.load(deckList, false, false);
} catch (GameException ex) {
logger.error("Error loading deck", ex);
user.showUserMessage("Join Table", "Error loading deck");
user.showUserMessage("Join Table", "Error loading deck: " + ex.getMessage());
return false;
}
} else {
@ -280,7 +280,7 @@ public class TableController {
deck = Deck.load(deckList, false, false);
} catch (GameException ex) {
logger.error("Error load deck", ex);
user.showUserMessage("Join Table", "Error loading deck");
user.showUserMessage("Join Table", "Error loading deck:" + ex.getMessage());
return false;
}
@ -373,7 +373,7 @@ public class TableController {
}
catch (GameException ex) {
logger.error("Error loading deck", ex);
user.showUserError("Submit deck", "Error loading deck");
user.showUserError("Submit deck", "Error loading deck: " + ex.getMessage());
return false;
}
if (table.getState() == TableState.SIDEBOARDING && table.getMatch() != null) {
@ -402,7 +402,7 @@ public class TableController {
}
catch (GameException ex) {
logger.error("Error loading deck", ex);
user.showUserError("Update deck", "Error loading deck");
user.showUserError("Update deck", "Error loading deck: " + ex.getMessage());
return;
}
updateDeck(userId, playerId, deck);

12
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -407,12 +407,12 @@ public class GameController implements GameCallback {
if (allJoined()) {
joinWaitingExecutor.shutdownNow();
ThreadExecutor.getInstance().getCallExecutor().execute(
new Runnable() {
@Override
public void run() {
startGame();
}
});
new Runnable() {
@Override
public void run() {
startGame();
}
});
}
}