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

Fixed a problem with NPE and match start. Chanes to handling of logging.

Browse source
This commit is contained in:
LevelX2 2014-09-09 07:45:53 +02:00
parent f670cb3977
commit 9c1f69983b
4 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -932,7 +932,11 @@ class MatchesTableModel extends AbstractTableModel {
case 4:
return matches[arg0].getResult();
case 5:
return timeFormatter.format(matches[arg0].getStartTime());
if (matches[arg0].getStartTime() != null) {
return timeFormatter.format(matches[arg0].getStartTime());
} else {
return "";
}
case 6:
if (matches[arg0].getEndTime() != null) {
return timeFormatter.format(matches[arg0].getEndTime());

21
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -821,19 +821,18 @@ public class TableController {
int humanPlayers = 0;
int aiPlayers = 0 ;
int validHumanPlayers = 0;
if (match == null && !(table.getState().equals(TableState.WAITING) ||
table.getState().equals(TableState.STARTING) ||
table.getState().equals(TableState.READY_TO_START) )) {
logger.debug("- Match table with no match:");
logger.debug("-- matchId:" + match.getId() + " [" + match.getName() + "]");
// return false;
}
if (match.isDoneSideboarding()) {
if (match.getGame() == null) {
// no sideboarding and not active game -> match seems to hang (maybe the Draw bug)
logger.debug("- Match with no active game and not in sideboard state:");
if (!(table.getState().equals(TableState.WAITING) || table.getState().equals(TableState.STARTING) || table.getState().equals(TableState.READY_TO_START))) {
if (match == null) {
logger.debug("- Match table with no match:");
logger.debug("-- matchId:" + match.getId() + " [" + match.getName() + "]");
// return false;
} else {
if (match.isDoneSideboarding() && match.getGame() == null) {
// no sideboarding and not active game -> match seems to hang (maybe the Draw bug)
logger.debug("- Match with no active game and not in sideboard state:");
logger.debug("-- matchId:" + match.getId() + " [" + match.getName() + "]");
// return false;
}
}
}
// check for active players

2
Mage/src/mage/game/GameStates.java
View file

@ -61,7 +61,7 @@ public class GameStates implements Serializable {
states.remove(states.size() - 1);
}
// return new Copier<GameState>().uncompressCopy(states.get(index));
logger.debug("Rolling back state: " + index);
logger.trace("Rolling back state: " + index);
return states.get(index);
}
return null;

4
Mage/src/mage/game/match/MatchImpl.java
View file

@ -63,7 +63,7 @@ public abstract class MatchImpl implements Match {
public MatchImpl(MatchOptions options) {
this.options = options;
startTime = null;
this.startTime = new Date(); // to avaoid null pointer exceptions
replayAvailable = false;
draws = 0;
}
@ -133,7 +133,7 @@ public abstract class MatchImpl implements Match {
@Override
public boolean hasStarted() {
return startTime != null;
return startedGames > 0;
}
@Override