From 6c54812068e8d2be1eb489f85c09718be3f6d35b Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 21 Oct 2013 23:58:11 +0200
Subject: [PATCH] * User list added info about games and tournaments. Fixed a
 logging NPE.

---
 .../main/java/mage/client/chat/ChatPanel.java   |  2 +-
 .../main/java/mage/server/TableController.java  |  2 +-
 Mage.Server/src/main/java/mage/server/User.java | 17 +++++++++++++++++
 .../java/mage/server/game/GamesRoomImpl.java    | 12 ++++++------
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
index 9ff064a5af4..b952114ac75 100644
--- a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
+++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
@@ -439,7 +439,7 @@ class TableModel extends AbstractTableModel {
                     }
                 }
             }
-            if (update && list != null) {
+            if (update) {
                 synchronized (tableModel) {
                     this.players = list;
                     tableModel.loadData(this.players);
diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java
index e5e53bbf019..a80f053f4e0 100644
--- a/Mage.Server/src/main/java/mage/server/TableController.java
+++ b/Mage.Server/src/main/java/mage/server/TableController.java
@@ -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()));
diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java
index 1ac44db803c..59b101a7a8c 100644
--- a/Mage.Server/src/main/java/mage/server/User.java
+++ b/Mage.Server/src/main/java/mage/server/User.java
@@ -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();
+    }
 }
diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
index d020e940c80..3a012662840 100644
--- a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
+++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
@@ -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;
     }