From c8b6dde3d95910dc9eaf4549a5cefdeb8e12033d Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Fri, 30 Mar 2012 22:19:20 +0300
Subject: [PATCH] Fix - target pointer should be set from wrapper effects.

---
 .../mage/abilities/decorator/ConditionalContinousEffect.java  | 4 ++++
 .../mage/abilities/decorator/ConditionalOneShotEffect.java    | 2 ++
 Mage/src/mage/abilities/effects/common/DoIfCostPaid.java      | 1 +
 3 files changed, 7 insertions(+)

diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
index 9ceffa3033a..45e8c70e05b 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
@@ -48,8 +48,10 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
     @Override
     public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game game) {
         if (condition.apply(game, source)) {
+            effect.setTargetPointer(this.targetPointer);
             return effect.apply(layer, sublayer, source, game);
         } else if (otherwiseEffect != null) {
+            otherwiseEffect.setTargetPointer(this.targetPointer);
             return otherwiseEffect.apply(layer, sublayer, source, game);
         }
         return false;
@@ -58,8 +60,10 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
     @Override
     public boolean apply(Game game, Ability source) {
         if (condition.apply(game, source)) {
+            effect.setTargetPointer(this.targetPointer);
             return effect.apply(game, source);
         } else if (otherwiseEffect != null) {
+            otherwiseEffect.setTargetPointer(this.targetPointer);
             return otherwiseEffect.apply(game, source);
         }
         return false;
diff --git a/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
index f739d22b79e..31e698885f4 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
@@ -67,8 +67,10 @@ public class ConditionalOneShotEffect extends OneShotEffect<ConditionalOneShotEf
 	@Override
 	public boolean apply(Game game, Ability source) {
 		if (condition.apply(game, source)) {
+			effect.setTargetPointer(this.targetPointer);
 			return effect.apply(game, source);
 		} else if (otherwiseEffect != null) {
+			otherwiseEffect.setTargetPointer(this.targetPointer);
 			return otherwiseEffect.apply(game, source);
 		}
 		return false;
diff --git a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
index a2a5ffefc90..3d75ac12237 100644
--- a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
+++ b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
@@ -31,6 +31,7 @@ public class DoIfCostPaid extends OneShotEffect<DoIfCostPaid> {
 			if (player.chooseUse(executingEffect.getOutcome(), "Pay " + cost.getText() + " and " + executingEffect.getText(source.getModes().getMode()), game)) {
 				cost.clearPaid();
 				if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) {
+                    executingEffect.setTargetPointer(this.targetPointer);
                     return executingEffect.apply(game, source);
                 }
 			}