mirror of
https://github.com/correl/mage.git
synced 2024-12-24 11:50:45 +00:00
Fixed possible null pointer exception.
This commit is contained in:
parent
6a973f1f7b
commit
7750bc2cd9
1 changed files with 5 additions and 5 deletions
|
@ -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,16 +1241,16 @@ 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);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(abilities.values()));
|
||||
|
||||
|
||||
waitForResponse(game);
|
||||
if (response.getUUID() != null && isInGame()) {
|
||||
if (abilities.containsKey(response.getUUID())) {
|
||||
|
|
Loading…
Reference in a new issue