From aec56554b8a7540f5ee8c8a5a7ea84827af59880 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 5 Sep 2014 13:07:05 +0200
Subject: [PATCH] User info - Disconnect info is now shown in the Connection
 column.

---
 Mage.Server/src/main/java/mage/server/User.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java
index 5ee2c44fd99..0c9806d075e 100644
--- a/Mage.Server/src/main/java/mage/server/User.java
+++ b/Mage.Server/src/main/java/mage/server/User.java
@@ -367,10 +367,6 @@ public class User {
     public String getGameInfo() {
         StringBuilder sb = new StringBuilder();
 
-        String disconnectInfo = "";
-        if (!isConnected()) {
-            disconnectInfo = new StringBuilder(" (discon. ").append(getDisconnectDuration()).append(")").toString();
-        }
         int draft = 0, match = 0, sideboard = 0, tournament = 0, construct = 0;
 
         for (Map.Entry<UUID, Table> tableEntry : tables.entrySet()) {
@@ -395,7 +391,7 @@ public class User {
                                     }
 
                                     if (!isConnected()) {
-                                        tournamentPlayer.setDisconnectInfo(disconnectInfo);
+                                        tournamentPlayer.setDisconnectInfo(" (discon. "+ getDisconnectDuration() + ")");
                                     } else {
                                         tournamentPlayer.setDisconnectInfo("");
                                     }
@@ -438,7 +434,6 @@ public class User {
         if (watchedGames.size() > 0) {
             sb.append("Watch: ").append(watchedGames.size()).append(" ");
         }
-        sb.append(disconnectInfo);
         return sb.toString();
     }
 
@@ -463,7 +458,11 @@ public class User {
     }
 
     public String getPingInfo() {
-        return pingInfo;
+        if (isConnected()) {
+            return pingInfo;
+        } else {
+            return " (discon. "+ getDisconnectDuration() + ")";
+        }
     }
     
 }