Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Some rework of User/Tournament/Quit handling.

Browse source
This commit is contained in:
LevelX2 2014-12-20 17:54:02 +01:00
parent 9ea54b38c2
commit 0ef340d108
10 changed files with 130 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java
View file

@ -101,7 +101,7 @@ public class TournamentSession {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
int remaining = (int) futureTimeout.getDelay(TimeUnit.SECONDS);
user.construct(tournament.getPlayer(playerId).getDeck(), tableId, remaining);
user.ccConstruct(tournament.getPlayer(playerId).getDeck(), tableId, remaining);
}
}
}
@ -115,11 +115,6 @@ public class TournamentSession {
tournament.updateDeck(playerId, deck);
}
protected void handleRemoteException(RemoteException ex) {
logger.fatal("TournamentSession error - userId " + userId + " tId " + tournament.getId(), ex);
TournamentManager.getInstance().kill(tournament.getId(), userId);
}
public void setKilled() {
killed = true;
}