github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 17:00:13 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some handling to possible NPEs.

Browse source
This commit is contained in:
LevelX2 2013-07-15 00:54:14 +02:00
parent bc9dca4d8a
commit 40c6ba2efc
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,7 +109,12 @@ public class TableController {
tournament = TournamentFactory.getInstance().createTournament(options.getTournamentType(), options); tournament = TournamentFactory.getInstance().createTournament(options.getTournamentType(), options);
if (userId != null) { if (userId != null) {
User user = UserManager.getInstance().getUser(userId); User user = UserManager.getInstance().getUser(userId);
controllerName = user.getName(); if (user == null) {
logger.fatal(new StringBuilder("User for userId ").append(userId).append(" could not be retrieved from UserManager").toString());
controllerName = "[unknown]";
} else {
controllerName = user.getName();
}
} }
else { else {
controllerName = "System"; controllerName = "System";
@ -177,6 +182,9 @@ public class TableController {
} }
Player player = createPlayer(name, seat.getPlayerType(), skill); Player player = createPlayer(name, seat.getPlayerType(), skill);
if (player == null) {
throw new GameException(new StringBuilder("Could not create player ").append(name).append(" of type ").append(seat.getPlayerType().toString()).toString());
}
match.addPlayer(player, deck); match.addPlayer(player, deck);
table.joinTable(player, seat); table.joinTable(player, seat);
User user = UserManager.getInstance().getUser(userId); User user = UserManager.getInstance().getUser(userId);
@ -456,7 +464,7 @@ public class TableController {
public void endGame() { public void endGame() {
// get player that chooses who goes first // get player that chooses who goes first
UUID choosingPlayerId = match.getChooser(); UUID choosingPlayerId = match.getChooser();
logger.warn("endGame() " + match.getPlayers().toString());
match.endGame(); match.endGame();
table.endGame(); table.endGame();
// Saving of games caused memory leaks - so save is deactivated // Saving of games caused memory leaks - so save is deactivated