diff --git a/Mage.Common/src/main/java/mage/remote/SessionImpl.java b/Mage.Common/src/main/java/mage/remote/SessionImpl.java index 20918b9b91b..dd073af9a99 100644 --- a/Mage.Common/src/main/java/mage/remote/SessionImpl.java +++ b/Mage.Common/src/main/java/mage/remote/SessionImpl.java @@ -1,12 +1,5 @@ package mage.remote; -import java.io.*; -import java.lang.reflect.UndeclaredThrowableException; -import java.net.*; -import java.util.*; -import java.util.concurrent.CancellationException; -import java.util.concurrent.TimeUnit; -import javax.swing.*; import mage.MageException; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardInfo; @@ -35,6 +28,14 @@ import org.jboss.remoting.transport.bisocket.Bisocket; import org.jboss.remoting.transport.socket.SocketWrapper; import org.jboss.remoting.transporter.TransporterClient; +import javax.swing.*; +import java.io.*; +import java.lang.reflect.UndeclaredThrowableException; +import java.net.*; +import java.util.*; +import java.util.concurrent.CancellationException; +import java.util.concurrent.TimeUnit; + /** * @author BetaSteward_at_googlemail.com, JayDi85 */ @@ -501,7 +502,7 @@ public class SessionImpl implements Session { /** * @param askForReconnect - true = connection was lost because of error and - * ask the user if they want to try to reconnect + * ask the user if they want to try to reconnect */ @Override public synchronized void disconnect(boolean askForReconnect) { @@ -1676,7 +1677,7 @@ public class SessionImpl implements Session { sum += time; } milliSeconds = TimeUnit.MILLISECONDS.convert(sum / pingTime.size(), TimeUnit.NANOSECONDS); - pingInfo = lastPing + " (Av: " + (milliSeconds > 0 ? milliSeconds + "ms" : "<1ms") + ')'; + pingInfo = lastPing + " (avg: " + (milliSeconds > 0 ? milliSeconds + "ms" : "<1ms") + ')'; } return true; } catch (MageException ex) { diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java index 5bbe4991be1..447eb07df0e 100644 --- a/Mage.Server/src/main/java/mage/server/User.java +++ b/Mage.Server/src/main/java/mage/server/User.java @@ -193,10 +193,11 @@ public class User { } public String getDisconnectDuration() { - long secondsDisconnected = getSecondsDisconnected(); - int minutes = (int) secondsDisconnected / 60; - int seconds = (int) secondsDisconnected % 60; - return Integer.toString(minutes) + ':' + (seconds > 9 ? seconds : '0' + Integer.toString(seconds)); + //long secondsDisconnected = getSecondsDisconnected(); + //int minutes = (int) secondsDisconnected / 60; + //int seconds = (int) secondsDisconnected % 60; + //return Integer.toString(minutes) + ':' + (seconds > 9 ? seconds : '0' + Integer.toString(seconds)); + return getSecondsDisconnected() + " secs"; } public long getSecondsDisconnected() { @@ -218,7 +219,11 @@ public class User { hours = minutes / 60; minutes = minutes - (hours * 60); } - return hours + ":" + (minutes > 9 ? Integer.toString(minutes) : '0' + Integer.toString(minutes)); + String connTime = hours + ":" + (minutes > 9 ? Integer.toString(minutes) : '0' + Integer.toString(minutes)); + + int lastSecs = (int) SystemUtil.getDateDiff(lastActivity, new Date(), TimeUnit.SECONDS); + + return " (online: " + connTime + "; seen: " + lastSecs + " sec ago)"; } public void fireCallback(final ClientCallback call) { diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 84a14fbff68..5ec5bd688e1 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -1192,7 +1192,7 @@ public class GameController implements GameCallback { List usersInfo = new ArrayList<>(); for (Map.Entry entry : userPlayerMap.entrySet()) { Optional user = UserManager.instance.getUser(entry.getKey()); - user.ifPresent(u -> usersInfo.add(u.getName() + ": " + u.getPingInfo())); + user.ifPresent(u -> usersInfo.add("* " + u.getName() + ": " + u.getPingInfo())); } Collections.sort(usersInfo); usersInfo.add(0, "Players ping:"); @@ -1200,7 +1200,7 @@ public class GameController implements GameCallback { List watchersinfo = new ArrayList<>(); for (Map.Entry entry : watchers.entrySet()) { Optional user = UserManager.instance.getUser(entry.getValue().userId); - user.ifPresent(u -> watchersinfo.add(u.getName() + ": " + u.getPingInfo())); + user.ifPresent(u -> watchersinfo.add("* " + u.getName() + ": " + u.getPingInfo())); } Collections.sort(watchersinfo); if (watchersinfo.size() > 0) {