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

Fixed some handling to possible NPEs.

Browse source
This commit is contained in:
LevelX2 2013-07-15 00:53:30 +02:00
parent e7cb9d567d
commit bc9dca4d8a
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Common/src/mage/view/TableView.java
View file

@ -81,7 +81,10 @@ public class TableView implements Serializable {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
StringBuilder sbScore = new StringBuilder(); StringBuilder sbScore = new StringBuilder();
for(MatchPlayer matchPlayer: table.getMatch().getPlayers()) { for(MatchPlayer matchPlayer: table.getMatch().getPlayers()) {
if (!matchPlayer.getPlayer().getName().equals(table.getControllerName())) { if (matchPlayer.getPlayer() == null) {
sb.append(", ").append("[unknown]");
sbScore.append("-").append(matchPlayer.getWins());
} else if (!matchPlayer.getPlayer().getName().equals(table.getControllerName())) {
sb.append(", ").append(matchPlayer.getPlayer().getName()); sb.append(", ").append(matchPlayer.getPlayer().getName());
sbScore.append("-").append(matchPlayer.getWins()); sbScore.append("-").append(matchPlayer.getWins());
} else { } else {

6
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -701,7 +701,11 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
updateGameStatePriority("getAmount", game); updateGameStatePriority("getAmount", game);
game.fireGetAmountEvent(playerId, message, min, max); game.fireGetAmountEvent(playerId, message, min, max);
waitForIntegerResponse(game); waitForIntegerResponse(game);
return response.getInteger(); if (response != null) {
return response.getInteger();
} else {
return 0;
}
} }
@Override @Override

3
Mage/src/mage/game/Table.java
View file

@ -32,8 +32,8 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import mage.constants.TableState;
import mage.cards.decks.DeckValidator; import mage.cards.decks.DeckValidator;
import mage.constants.TableState;
import mage.game.events.Listener; import mage.game.events.Listener;
import mage.game.events.TableEvent; import mage.game.events.TableEvent;
import mage.game.events.TableEventSource; import mage.game.events.TableEventSource;
@ -56,6 +56,7 @@ public class Table implements Serializable {
private Seat[] seats; private Seat[] seats;
private int numSeats; private int numSeats;
private boolean isTournament; private boolean isTournament;
private boolean isTournamentSubTable;
private DeckValidator validator; private DeckValidator validator;
private TableState state = TableState.WAITING; private TableState state = TableState.WAITING;
private Match match; private Match match;