Fixed possible null pointer exception.

This commit is contained in:
LevelX2 2016-06-18 10:01:38 +02:00
parent 6a973f1f7b
commit 7750bc2cd9

View file

@ -689,7 +689,7 @@ public class HumanPlayer extends PlayerImpl {
result = true;
} else {
Player actingPlayer = null;
if (game.getPriorityPlayerId().equals(playerId)) {
if (playerId.equals(game.getPriorityPlayerId())) {
actingPlayer = this;
} else if (getPlayersUnderYourControl().contains(game.getPriorityPlayerId())) {
actingPlayer = game.getPlayer(game.getPriorityPlayerId());
@ -1241,7 +1241,7 @@ public class HumanPlayer extends PlayerImpl {
return;
}
}
if (userData.isUseFirstManaAbility() && object instanceof Permanent && object.getCardType().contains(CardType.LAND)){
if (userData.isUseFirstManaAbility() && object instanceof Permanent && object.getCardType().contains(CardType.LAND)) {
ActivatedAbility ability = abilities.values().iterator().next();
if (ability instanceof ManaAbility) {
activateAbility(ability, game);