From adcbcc75f764fc91e07e66d55cabaa257104c871 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 15 Jun 2014 19:05:58 +0200 Subject: [PATCH] * Fixed NPE in TargetImpl. --- .../abilities/effects/common/counter/ProliferateEffect.java | 2 +- Mage/src/mage/target/TargetImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java b/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java index e4802c064f7..99acfdfef6e 100644 --- a/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java +++ b/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java @@ -65,7 +65,7 @@ public class ProliferateEffect extends OneShotEffect { //had, if thats the case this ability should fizzle. if (target.canChoose(controller.getId(), game)) { boolean abilityApplied = false; - Map options = new HashMap(); + Map options = new HashMap<>(); options.put("UI.right.btn.text", "Done"); while (target.canChoose(controller.getId(), game)) { if (controller.choose(Outcome.Benefit, target, source.getSourceId(), game, options)) { diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java index 30c2fc1903e..d0a07104589 100644 --- a/Mage/src/mage/target/TargetImpl.java +++ b/Mage/src/mage/target/TargetImpl.java @@ -164,7 +164,7 @@ public abstract class TargetImpl implements Target { @Override public boolean isRequired(Ability ability) { - return ability.isActivated() || !(ability.getAbilityType().equals(AbilityType.SPELL) || ability.getAbilityType().equals(AbilityType.ACTIVATED)); + return ability == null || ability.isActivated() || !(ability.getAbilityType().equals(AbilityType.SPELL) || ability.getAbilityType().equals(AbilityType.ACTIVATED)); } @Override