From eafa18a6e88ff1dcae9a10eb20ce1c441d3a61f7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 21 Sep 2013 23:46:48 +0200 Subject: [PATCH] Fixed possible NPE in HumanPlayer. --- .../src/mage/player/human/HumanPlayer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 1a68982047a..c4bbb9623c2 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 @@ -55,14 +55,12 @@ import mage.cards.Cards; import mage.cards.decks.Deck; import mage.choices.Choice; import mage.choices.ChoiceImpl; -import mage.constants.AsThoughEffectType; import mage.constants.Outcome; import mage.constants.RangeOfInfluence; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterBlockingCreature; import mage.filter.common.FilterCreatureForCombat; -import mage.filter.common.FilterCreatureForCombatBase; import mage.filter.common.FilterCreatureForCombatBlock; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -521,8 +519,8 @@ public class HumanPlayer extends PlayerImpl { updateGameStatePriority("announceXMana", game); game.fireGetAmountEvent(playerId, message, min, max); waitForIntegerResponse(game); - if (response != null) { - xValue = response.getInteger(); + if (response != null && response.getInteger() != null) { + xValue = response.getInteger().intValue(); } return xValue; }