From 024ec1169a1e4b6280e42e1cb80ff60203bd76e6 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 28 Feb 2014 14:18:14 +0100 Subject: [PATCH] * Reflecting Pool - Fixed possible NPE. --- .../src/mage/sets/tempest/ReflectingPool.java | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java b/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java index 99abc014c7a..d22d4a3cf72 100644 --- a/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java +++ b/Mage.Sets/src/mage/sets/tempest/ReflectingPool.java @@ -131,19 +131,30 @@ class ReflectingPoolEffect extends ManaEffect { } else { player.choose(outcome, choice, game); } - if (choice.getChoice().equals("Black")) { - player.getManaPool().addMana(Mana.BlackMana, game, source); - } else if (choice.getChoice().equals("Blue")) { - player.getManaPool().addMana(Mana.BlueMana, game, source); - } else if (choice.getChoice().equals("Red")) { - player.getManaPool().addMana(Mana.RedMana, game, source); - } else if (choice.getChoice().equals("Green")) { - player.getManaPool().addMana(Mana.GreenMana, game, source); - } else if (choice.getChoice().equals("White")) { - player.getManaPool().addMana(Mana.WhiteMana, game, source); - } else if (choice.getChoice().equals("Colorless")) { - player.getManaPool().addMana(Mana.ColorlessMana, game, source); + if (choice.getChoice() != null) { + switch (choice.getChoice()) { + case "Black": + player.getManaPool().addMana(Mana.BlackMana, game, source); + break; + case "Blue": + player.getManaPool().addMana(Mana.BlueMana, game, source); + break; + case "Red": + player.getManaPool().addMana(Mana.RedMana, game, source); + break; + case "Green": + player.getManaPool().addMana(Mana.GreenMana, game, source); + break; + case "White": + player.getManaPool().addMana(Mana.WhiteMana, game, source); + break; + case "Colorless": + player.getManaPool().addMana(Mana.ColorlessMana, game, source); + break; + } + return true; } + return false; } return true; }