From 658c4fc2366bf50add48995f874637c470508cde Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Fri, 18 Mar 2011 22:15:49 -0400
Subject: [PATCH] fixed issue 38

---
 .../common/RegenerateSourceEffect.java        |  5 ++-
 .../common/RegenerateTargetEffect.java        | 31 +++++++------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Mage/src/mage/abilities/effects/common/RegenerateSourceEffect.java b/Mage/src/mage/abilities/effects/common/RegenerateSourceEffect.java
index 2a0ed1bf271..b200f5ab725 100644
--- a/Mage/src/mage/abilities/effects/common/RegenerateSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/RegenerateSourceEffect.java
@@ -53,11 +53,13 @@ public class RegenerateSourceEffect extends ReplacementEffectImpl<RegenerateSour
 
 	@Override
 	public boolean apply(Game game, Ability source) {
+		//20110204 - 701.11
 		Permanent permanent = game.getPermanent(source.getSourceId());
 		if (permanent != null) {
 			permanent.setTapped(true);
 			permanent.removeFromCombat(game);
 			permanent.removeAllDamage(game);
+			this.used = true;
 			return true;
 		}
 		return false;
@@ -75,7 +77,8 @@ public class RegenerateSourceEffect extends ReplacementEffectImpl<RegenerateSour
 
 	@Override
 	public boolean applies(GameEvent event, Ability source, Game game) {
-		if (event.getType() == EventType.DESTROY_PERMANENT && event.getAmount() == 0 && event.getTargetId().equals(source.getSourceId())) {
+		//20110204 - 701.11c - event.getAmount() is used to signal if regeneration is allowed
+		if (event.getType() == EventType.DESTROY_PERMANENT && event.getAmount() == 0 && event.getTargetId().equals(source.getSourceId()) && !this.used) {
 			return true;
 		}
 		return false;
diff --git a/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java b/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java
index 0fbfd0999d0..240e5bf9c24 100644
--- a/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java
@@ -53,6 +53,15 @@ public class RegenerateTargetEffect  extends ReplacementEffectImpl<RegenerateTar
 
 	@Override
 	public boolean apply(Game game, Ability source) {
+		//20110204 - 701.11
+		Permanent permanent = game.getPermanent(source.getFirstTarget());
+		if (permanent != null) {
+			permanent.setTapped(true);
+			permanent.removeFromCombat(game);
+			permanent.removeAllDamage(game);
+			this.used = true;
+			return true;
+		}
 		return false;
 	}
 
@@ -63,29 +72,13 @@ public class RegenerateTargetEffect  extends ReplacementEffectImpl<RegenerateTar
 
 	@Override
 	public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-		if ( source.getFirstTarget().equals(event.getTargetId())) {
-			Permanent permanent = game.getPermanent(source.getFirstTarget());
-			if (permanent != null) {
-				permanent.setTapped(true);
-				permanent.removeFromCombat(game);
-				permanent.removeAllDamage(game);
-				this.used = true;
-				return true;
-			}
-		}
-		return false;
+		return apply(game, source);
 	}
 
 	@Override
 	public boolean applies(GameEvent event, Ability source, Game game) {
-		boolean eventApplies = (event.getType() == EventType.DAMAGE_CREATURE ||
-				                event.getType() == EventType.DAMAGED_CREATURE ||
-								event.getType() == EventType.DESTROYED_PERMANENT ||
-								event.getType() == EventType.DESTROY_PERMANENT);
-		eventApplies &= (event.getAmount() >= 0 &&
-				         event.getTargetId().equals(source.getTargets().get(0).getFirstTarget()) &&
-						 !this.used);
-		if (eventApplies) {
+		//20110204 - 701.11c - event.getAmount() is used to signal if regeneration is allowed
+		if (event.getType() == EventType.DESTROY_PERMANENT && event.getAmount() == 0 && event.getTargetId().equals(source.getFirstTarget()) && !this.used) {
 			return true;
 		}
 		return false;