From 6baf6d5ee4f4e4ed243173d8a8747328f76cba4a Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sun, 7 Aug 2011 00:24:25 +0000
Subject: [PATCH] - Adding Conditional to CounterMagic

---
 .../AbilityFactory_CounterMagic.java           | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/forge/card/abilityFactory/AbilityFactory_CounterMagic.java b/src/forge/card/abilityFactory/AbilityFactory_CounterMagic.java
index 2bf82f604bf..192ff371de6 100644
--- a/src/forge/card/abilityFactory/AbilityFactory_CounterMagic.java
+++ b/src/forge/card/abilityFactory/AbilityFactory_CounterMagic.java
@@ -256,8 +256,12 @@ public class AbilityFactory_CounterMagic {
 	}
 	
 	private void counterResolve(final AbilityFactory af, final SpellAbility sa) {
+		if (!AbilityFactory.checkConditional(params, sa)){
+			AbilityFactory.resolveSubAbility(sa);
+			return;
+		}	
+		
 		// TODO: Before this resolves we should see if any of our targets are still on the stack
-		Card source = sa.getSourceCard();
 		Target tgt = sa.getTarget();
 		
 		ArrayList<SpellAbility> sas = tgt.getTargetSAs();
@@ -332,17 +336,7 @@ public class AbilityFactory_CounterMagic {
 			}
 		}
 
-		if (af.hasSubAbility()){
-			Ability_Sub abSub = sa.getSubAbility();
-			if (abSub != null){
-				abSub.resolve();
-			}
-			else{
-				//I think UntapUpTo is the main thing holding this back
-				String DrawBack = params.get("SubAbility");
-				CardFactoryUtil.doDrawBack(DrawBack, 0, source.getController(), source.getController().getOpponent(), source.getController(), source, null, sa);
-			}
-		}
+		AbilityFactory.resolveSubAbility(sa);
 	}//end counterResolve
 	
 	private void doPowerSink(Player p) {