From c12157962dc96cc72d07e479218fd17d36719258 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 6 Apr 2016 21:10:40 +0200
Subject: [PATCH] Zada, Hedron Grinder - Fixed some problems with targeting
 handling (fixes #1790).

---
 .../src/mage/sets/battleforzendikar/ZadaHedronGrinder.java | 7 ++++---
 .../mage/sets/shadowsoverinnistrad/SilverfurPartisan.java  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/ZadaHedronGrinder.java b/Mage.Sets/src/mage/sets/battleforzendikar/ZadaHedronGrinder.java
index e635f2d6de2..03fec256cf0 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/ZadaHedronGrinder.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/ZadaHedronGrinder.java
@@ -183,19 +183,20 @@ class ZadaHedronGrinderEffect extends OneShotEffect {
             for (Permanent creature : game.getState().getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), game)) {
                 if (!creature.getId().equals(source.getSourceId()) && usedTarget.canTarget(source.getControllerId(), creature.getId(), source, game)) {
                     Spell copy = spell.copySpell(source.getControllerId());
+                    game.getStack().push(copy);
                     setTarget:
-                    for (Mode mode : spell.getSpellAbility().getModes().getSelectedModes()) {
+                    for (Mode mode : copy.getSpellAbility().getModes().getSelectedModes()) {
                         for (Target target : mode.getTargets()) {
                             if (target.getClass().equals(usedTarget.getClass())) {
                                 target.clearChosen(); // For targets with Max > 1 we need to clear before the text is comapred
                                 if (target.getMessage().equals(usedTarget.getMessage())) {
-                                    target.add(creature.getId(), game);
+                                    target.addTarget(creature.getId(), copy.getSpellAbility(), game, false);
                                     break setTarget;
                                 }
                             }
                         }
                     }
-                    game.getStack().push(copy);
+
                     String activateMessage = copy.getActivatedMessage(game);
                     if (activateMessage.startsWith(" casts ")) {
                         activateMessage = activateMessage.substring(6);
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SilverfurPartisan.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SilverfurPartisan.java
index d3ff04f88fc..095ca138a71 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SilverfurPartisan.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/SilverfurPartisan.java
@@ -105,7 +105,7 @@ class CreaturesYouControlBecomesTargetTriggeredAbility extends TriggeredAbilityI
             if (object != null && object instanceof Spell) {
                 Card c = (Spell) object;
                 if (c.getCardType().contains(CardType.INSTANT) || c.getCardType().contains(CardType.SORCERY)) {
-                    if (getTargets().size() == 0) {
+                    if (getTargets().isEmpty()) {
                         for (Effect effect : getEffects()) {
                             effect.setTargetPointer(new FixedTarget(event.getTargetId()));
                         }