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

* User list added info about games and tournaments. Fixed a logging NPE.

Browse source
This commit is contained in:
LevelX2 2013-10-21 23:58:11 +02:00
parent 663c31cec6
commit 6c54812068
4 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -526,7 +526,7 @@ public class TableController {
for (Entry<UUID, UUID> entry: userPlayerMap.entrySet()) {
User user = UserManager.getInstance().getUser(entry.getKey());
if (user != null) {
logger.info(new StringBuilder("User ").append(user.getName()).append(" draft started: ").append(match.getId()).append(" userId: ").append(user.getId()));
logger.info(new StringBuilder("User ").append(user.getName()).append(" draft started: ").append(draft.getId()).append(" userId: ").append(user.getId()));
user.draftStarted(draft.getId(), entry.getValue());
} else {
logger.fatal(new StringBuilder("Start draft user not found userId: ").append(entry.getKey()));

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

@ -305,4 +305,21 @@ public class User {
return this.userData;
}
public String getUserInfo() {
StringBuilder sb = new StringBuilder();
if (gameSessions.size() > 0) {
sb.append("G: ").append(gameSessions.size());
}
if (tournamentSessions.size() > 0) {
if (sb.length() > 0) {
sb.append(" ");
}
sb.append("T: ").append(tournamentSessions.size());
}
if (sb.length() > 0) {
sb.insert(0, " - [");
sb.append("]");
}
return sb.toString();
}
}

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

@ -111,12 +111,12 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
matchView = matchList;
List<String> players = new ArrayList<String>();
for (User user : UserManager.getInstance().getUsers()) {
if (user.isConnected()) {
players.add(user.getName());
} else {
players.add(new StringBuilder(user.getName()).append(" (discon.)").toString());
}
StringBuilder sb = new StringBuilder(user.getName());
sb.append(user.getUserInfo());
if (!user.isConnected()) {
sb.append(" (discon.)");
}
players.add(sb.toString());
}
playersView = players;
}