From c87f3c2b333cc76aa26529e206e7cb55f297b755 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 21 Jan 2016 16:40:16 +0100
Subject: [PATCH] * Nissa's Judgment - Fixed that the target opponent creature
 was wrongly selected during resolution instead of declaration.

---
 .../oathofthegatewatch/NissasJudgment.java    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java
index 3d9b527d347..aa47a0db5e0 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java
@@ -44,7 +44,6 @@ import mage.filter.predicate.permanent.CounterPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
-import mage.target.Target;
 import mage.target.common.TargetCreaturePermanent;
 import mage.target.targetpointer.SecondTargetPointer;
 
@@ -54,6 +53,12 @@ import mage.target.targetpointer.SecondTargetPointer;
  */
 public class NissasJudgment extends CardImpl {
 
+    private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.OPPONENT));
+    }
+
     public NissasJudgment(UUID ownerId) {
         super(ownerId, 139, "Nissa's Judgment", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{G}");
         this.expansionSetCode = "OGW";
@@ -64,6 +69,7 @@ public class NissasJudgment extends CardImpl {
         // Choose up to one target creature an opponent controls. Each creature you control with a +1/+1 counter on it deals damage equal to its power to that creature.
         Effect effect = new NissasJudgmentEffect();
         effect.setTargetPointer(new SecondTargetPointer()); // First target is used by Support
+        getSpellAbility().addTarget(new TargetCreaturePermanent(0, 1, filter, true));
         getSpellAbility().addEffect(effect);
     }
 
@@ -105,14 +111,11 @@ class NissasJudgmentEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            Target target = new TargetCreaturePermanent(0, 1, filter, true);
-            if (controller.choose(outcome, target, source.getSourceId(), game)) {
-                Permanent targetCreature = game.getPermanent(target.getFirstTarget());
-                if (targetCreature != null) {
-                    for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filterWithCounter, controller.getId(), game)) {
-                        if (permanent.getPower().getValue() > 0) {
-                            targetCreature.damage(permanent.getPower().getValue(), permanent.getId(), game, false, true);
-                        }
+            Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
+            if (targetCreature != null) {
+                for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filterWithCounter, controller.getId(), game)) {
+                    if (permanent.getPower().getValue() > 0) {
+                        targetCreature.damage(permanent.getPower().getValue(), permanent.getId(), game, false, true);
                     }
                 }
             }