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

* Some chnages to logging, added changes to table health check.

Browse source
This commit is contained in:
LevelX2 2015-02-02 08:40:30 +01:00
parent b57dbd4bb3
commit 00801e3ecf
5 changed files with 59 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
View file

@ -226,6 +226,7 @@ public class TournamentController {
}
}
started = true;
logger.debug("Tournament starts (all players joined): " + tournament.getId() + " - " + tournament.getTournamentType().toString());
tournament.nextStep();
}
@ -455,4 +456,47 @@ public class TournamentController {
public void cleanUpOnRemoveTournament() {
ChatManager.getInstance().destroyChatSession(chatId);
}
/**
* Check tournaments that are not already finished, if they are in a still valid state
*
* @param tableState state of the tournament table
* @return true - if tournament is valid
* false - if tournament is not valid and should be removed
*/
public boolean isTournamentStillValid(TableState tableState) {
int activePlayers = 0;
for (Entry<UUID, UUID> entry: userPlayerMap.entrySet()) {
TournamentPlayer tournamentPlayer = tournament.getPlayer(entry.getValue());
if (tournamentPlayer != null) {
if (!tournamentPlayer.hasQuit()) {
if (tournamentPlayer.getPlayer().isHuman()) {
User user = UserManager.getInstance().getUser(entry.getKey());
if (user == null) {
logger.debug("Tournament user is missing but player active -> start quit - tournamentId: " + tournament.getId() + " state: " + tableState.toString());
// active tournament player but the user is no longer online
quit(entry.getKey());
}
}
activePlayers++;
}
} else {
// tournament player is missing
logger.debug("Tournament player is missing - tournamentId: " + tournament.getId() + " state: " + tableState.toString());
}
}
for(TournamentPlayer tournamentPlayer: tournament.getPlayers()) {
if (!tournamentPlayer.getPlayer().isHuman()) {
if (!tournamentPlayer.hasQuit()) {
activePlayers++;
}
}
}
if (activePlayers < 2 && !tableState.equals(TableState.WAITING)) {
logger.debug("Tournament has less than 2 active players - tournamentId: " + tournament.getId() + " state: " + tableState.toString());
return false;
}
return true;
}
}