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

Some changes to logging and exception handling.

Browse source
This commit is contained in:
LevelX2 2014-08-11 00:56:08 +02:00
parent 8c6893a8e8
commit 7992e654ff
4 changed files with 54 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Mage.Server/src/main/java/mage/server/User.java
View file

@ -366,35 +366,39 @@ public class User {
}
int draft = 0, match = 0, sideboard = 0, tournament = 0, construct = 0;
for (Map.Entry<UUID, Table> tableEntry : tables.entrySet()) {
Table table = tableEntry.getValue();
if (table.isTournament()) {
if (!table.getTournament().getPlayer(tableEntry.getKey()).isEliminated()) {
switch (table.getState()) {
case CONSTRUCTING:
construct++;
break;
case DRAFTING:
draft++;
break;
case DUELING:
tournament++;
break;
}
if (!isConnected()) {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo(disconnectInfo);
if (tableEntry != null) {
Table table = tableEntry.getValue();
if (table != null) {
if (table.isTournament()) {
if (!table.getTournament().getPlayer(tableEntry.getKey()).isEliminated()) {
switch (table.getState()) {
case CONSTRUCTING:
construct++;
break;
case DRAFTING:
draft++;
break;
case DUELING:
tournament++;
break;
}
if (!isConnected()) {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo(disconnectInfo);
} else {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo("");
}
}
} else {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo("");
switch (table.getState()) {
case SIDEBOARDING:
sideboard++;
break;
case DUELING:
match++;
break;
}
}
}
} else {
switch (table.getState()) {
case SIDEBOARDING:
sideboard++;
break;
case DUELING:
match++;
break;
}
}
}
if (match > 0) {
@ -415,7 +419,6 @@ public class User {
if (watchedGames.size() > 0) {
sb.append("Watch: ").append(watchedGames.size()).append(" ");
}
sb.append(disconnectInfo);
return sb.toString();
}

9
Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
View file

@ -116,9 +116,14 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
matchView = matchList;
List<UsersView> users = new ArrayList<>();
for (User user : UserManager.getInstance().getUsers()) {
StringBuilder sb = new StringBuilder(user.getGameInfo());
users.add(new UsersView(user.getName(), user.getInfo(), sb.toString()));
try {
users.add(new UsersView(user.getName(), user.getInfo(), user.getGameInfo()));
} catch (Exception ex) {
logger.fatal("User update exception: " + user.getName() + " - " + ex.toString(), ex);
users.add(new UsersView(user.getName(), user.getInfo(), "[exception]"));
}
}
Collections.sort(users, new UserNameSorter());
usersView = users;
}

1
Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java
View file

@ -153,6 +153,7 @@ public class TournamentSession {
private synchronized void cancelTimeout() {
if (futureTimeout != null) {
futureTimeout.cancel(false);
logger.debug("Timeout is Done: " + futureTimeout.isDone() + " userId: " + userId);
}
}