github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed possible null pointer exception.

Browse source
This commit is contained in:
LevelX2 2016-06-18 10:01:38 +02:00
parent 6a973f1f7b
commit 7750bc2cd9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -689,7 +689,7 @@ public class HumanPlayer extends PlayerImpl {
result = true; result = true;
} else { } else {
Player actingPlayer = null; Player actingPlayer = null;
if (game.getPriorityPlayerId().equals(playerId)) { if (playerId.equals(game.getPriorityPlayerId())) {
actingPlayer = this; actingPlayer = this;
} else if (getPlayersUnderYourControl().contains(game.getPriorityPlayerId())) { } else if (getPlayersUnderYourControl().contains(game.getPriorityPlayerId())) {
actingPlayer = game.getPlayer(game.getPriorityPlayerId()); actingPlayer = game.getPlayer(game.getPriorityPlayerId());
@ -1241,16 +1241,16 @@ public class HumanPlayer extends PlayerImpl {
return; 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(); ActivatedAbility ability = abilities.values().iterator().next();
if (ability instanceof ManaAbility) { if (ability instanceof ManaAbility) {
activateAbility(ability, game); activateAbility(ability, game);
return; return;
} }
} }
game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(abilities.values())); game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(abilities.values()));
waitForResponse(game); waitForResponse(game);
if (response.getUUID() != null && isInGame()) { if (response.getUUID() != null && isInGame()) {
if (abilities.containsKey(response.getUUID())) { if (abilities.containsKey(response.getUUID())) {