From acd52e2a6182b942e437c5ecb0d3f9677bf9d2dd Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 12 Sep 2013 13:14:22 +0200 Subject: [PATCH] Fixed possible NPE in HumanPlayer.announceXMana (Fixes #319). --- .../src/mage/player/human/HumanPlayer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 499f33763e1..1a68982047a 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 @@ -517,10 +517,14 @@ public class HumanPlayer extends PlayerImpl { */ @Override public int announceXMana(int min, int max, String message, Game game, Ability ability) { + int xValue = 0; updateGameStatePriority("announceXMana", game); game.fireGetAmountEvent(playerId, message, min, max); waitForIntegerResponse(game); - return response.getInteger(); + if (response != null) { + xValue = response.getInteger(); + } + return xValue; } protected void playManaAbilities(ManaCost unpaid, Game game) {