From 7750bc2cd9400e40a476c3a8fa8dd03898f4a525 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 18 Jun 2016 10:01:38 +0200 Subject: [PATCH] Fixed possible null pointer exception. --- .../src/mage/player/human/HumanPlayer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 781dab6157c..a731165f786 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -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())) {