From 7e4ab8d0bbe2ee72ff6d3531b294acc37a1fa1d8 Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 19 Dec 2016 16:47:45 +0000 Subject: [PATCH] - Fixed Grip of Chaos NPEing when Maze of Ith is used in its presence (and other potential similar NPEs). --- .../game/ability/effects/ChangeTargetsEffect.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java index 87cf6610324..8c340cc626b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java @@ -92,11 +92,13 @@ public class ChangeTargetsEffect extends SpellAbilityEffect { while(changingTgtSI != null) { SpellAbility changingTgtSA = changingTgtSI.getSpellAbility(true); if (sa.hasParam("RandomTarget")){ - changingTgtSA.resetTargets(); - List candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true); - GameEntity choice = Aggregates.random(candidates); - changingTgtSA.getTargets().add(choice); - changingTgtSI.updateTarget(changingTgtSA.getTargets()); + if (changingTgtSA.usesTargeting()) { + changingTgtSA.resetTargets(); + List candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true); + GameEntity choice = Aggregates.random(candidates); + changingTgtSA.getTargets().add(choice); + changingTgtSI.updateTarget(changingTgtSA.getTargets()); + } } else if (sa.hasParam("DefinedMagnet")){ GameObject newTarget = Iterables.getFirst(getDefinedCardsOrTargeted(sa, "DefinedMagnet"), null);