github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

User info - Disconnect info is now shown in the Connection column.

Browse source
This commit is contained in:
LevelX2 2014-09-05 13:07:05 +02:00
parent f12a616243
commit aec56554b8
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -367,10 +367,6 @@ public class User {
public String getGameInfo() { public String getGameInfo() {
StringBuilder sb = new StringBuilder(); 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; int draft = 0, match = 0, sideboard = 0, tournament = 0, construct = 0;
for (Map.Entry<UUID, Table> tableEntry : tables.entrySet()) { for (Map.Entry<UUID, Table> tableEntry : tables.entrySet()) {
@ -395,7 +391,7 @@ public class User {
} }
if (!isConnected()) { if (!isConnected()) {
tournamentPlayer.setDisconnectInfo(disconnectInfo); tournamentPlayer.setDisconnectInfo(" (discon. "+ getDisconnectDuration() + ")");
} else { } else {
tournamentPlayer.setDisconnectInfo(""); tournamentPlayer.setDisconnectInfo("");
} }
@ -438,7 +434,6 @@ public class User {
if (watchedGames.size() > 0) { if (watchedGames.size() > 0) {
sb.append("Watch: ").append(watchedGames.size()).append(" "); sb.append("Watch: ").append(watchedGames.size()).append(" ");
} }
sb.append(disconnectInfo);
return sb.toString(); return sb.toString();
} }
@ -463,7 +458,11 @@ public class User {
} }
public String getPingInfo() { public String getPingInfo() {
return pingInfo; if (isConnected()) {
return pingInfo;
} else {
return " (discon. "+ getDisconnectDuration() + ")";
}
} }
} }