External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 03:22:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some NPE fixing for server and client.

Browse source
This commit is contained in:
LevelX2 2014-08-12 08:51:06 +02:00
parent a2e93986bc
commit 9020a287d6
3 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@ import java.util.concurrent.TimeUnit;
import mage.cards.decks.Deck;
import mage.constants.ManaType;
import mage.game.Table;
import mage.game.tournament.TournamentPlayer;
import mage.interfaces.callback.ClientCallback;
import mage.players.net.UserData;
import mage.server.draft.DraftSession;
@ -73,7 +74,7 @@ public class User {
private final Map<UUID, TournamentSession> constructing;
private final Map<UUID, Deck> sideboarding;
private final List<UUID> watchedGames;
private final ArrayList<UUID> tablesToRemove = new ArrayList<>();
private String sessionId;
private String info;
private Date lastActivity;
@ -365,28 +366,37 @@ public class User {
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()) {
if (tableEntry != null) {
Table table = tableEntry.getValue();
if (table != null) {
if (table.isTournament()) {
if (!table.getTournament().getPlayer(tableEntry.getKey()).isEliminated()) {
switch (table.getState()) {
case CONSTRUCTING:
construct++;
break;
case DRAFTING:
draft++;
break;
case DUELING:
tournament++;
break;
}
if (!isConnected()) {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo(disconnectInfo);
if (tableEntry.getKey() != null) {
TournamentPlayer tournamentPlayer = table.getTournament().getPlayer(tableEntry.getKey());
if (tournamentPlayer != null && !tournamentPlayer.isEliminated()) {
switch (table.getState()) {
case CONSTRUCTING:
construct++;
break;
case DRAFTING:
draft++;
break;
case DUELING:
tournament++;
break;
}
if (!isConnected()) {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo(disconnectInfo);
} else {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo("");
}
} else {
table.getTournament().getPlayer(tableEntry.getKey()).setDisconnectInfo("");
tablesToRemove.add(tableEntry.getKey());
logger.error(getName() + " tournament player missing - tournamentId:" + table.getId(), null);
}
} else {
logger.error(getName() + " tournament key missing - tournamentId: " + table.getId(), null);
}
} else {
switch (table.getState()) {
@ -401,6 +411,12 @@ public class User {
}
}
}
if (!tablesToRemove.isEmpty()) {
for (UUID tableKey : tablesToRemove) {
tables.remove(tableKey);
}
tablesToRemove.clear();
}
if (match > 0) {
sb.append("Match: ").append(match).append(" ");
}