From db02ea3aa63286c03324f8feffbe7a3d4807f39b Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Sat, 3 Mar 2012 23:20:10 -0500
Subject: [PATCH] fixes

---
 .../mage/sets/eventide/AshlingTheExtinguisher.java    | 11 ++++++++++-
 .../src/mage/sets/magic2010/LightwielderPaladin.java  |  1 +
 .../src/mage/sets/newphyrexia/ArmWithAEther.java      |  1 +
 Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java  |  1 +
 Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java   |  1 +
 .../java/org/mage/test/cards/TestGravecrawler.java    |  2 --
 .../java/org/mage/test/cards/TestHavengulLich.java    |  9 ---------
 Mage/src/mage/Constants.java                          |  2 +-
 Mage/src/mage/game/GameImpl.java                      |  4 +++-
 9 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
index 8d042bfb8c6..576da1526b3 100644
--- a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
+++ b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
@@ -37,9 +37,11 @@ import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.common.SacrificeTargetEffect;
 import mage.cards.CardImpl;
+import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.events.DamagedPlayerEvent;
 import mage.game.events.GameEvent;
+import mage.players.Player;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -91,7 +93,14 @@ class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl<Ashlin
         if (event instanceof DamagedPlayerEvent) {
             DamagedPlayerEvent damageEvent = (DamagedPlayerEvent)event;
             if (damageEvent.isCombatDamage() && event.getSourceId().equals(this.getSourceId())) {
-			    return true;
+                Player opponent = game.getPlayer(event.getPlayerId());
+                if (opponent != null) {
+                    this.getTargets().clear();
+                    FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getName() + " controls");
+                    filter.getControllerId().add(opponent.getId());
+                    this.addTarget(new TargetCreaturePermanent(filter));
+                    return true;
+                }
             }
         }
         return false;
diff --git a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
index 27c99c30def..c6e011a7164 100644
--- a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
+++ b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
@@ -100,6 +100,7 @@ class LightwielderPaladinTriggeredAbility extends TriggeredAbilityImpl<Lightwiel
             filter.setScopeColor(ComparisonScope.Any);
             filter.getControllerId().add(event.getTargetId());
             filter.setNotController(false);
+            this.getTargets().clear();
             this.addTarget(new TargetPermanent(filter));
             return true;
         }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
index 47e2d5166b1..ae9d079c458 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
@@ -89,6 +89,7 @@ class ArmWithAEtherTriggeredAbility extends TriggeredAbilityImpl<ArmWithAEtherTr
     public boolean checkTrigger(GameEvent event, Game game) {
         Player opponent = game.getPlayer(event.getPlayerId());
         if (opponent != null && event.getType() == GameEvent.EventType.DAMAGED_PLAYER && event.getSourceId().equals(this.sourceId)) {
+            this.getTargets().clear();
             FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getName() + " controls");
             filter.getControllerId().add(opponent.getId());
             this.addTarget(new TargetCreaturePermanent(filter));
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
index 932033cbe6f..b9f2218a21e 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
@@ -106,6 +106,7 @@ class BlindZealotTriggeredAbility extends TriggeredAbilityImpl<BlindZealotTrigge
                 sb.append(" to destroy target creature controlled by ");
                 sb.append(game.getPlayer(event.getTargetId()).getName()).append("?");
                 if (player.chooseUse(Outcome.DestroyPermanent, sb.toString(), game)) {
+                    this.getTargets().clear();
                     FilterCreaturePermanent filter = new FilterCreaturePermanent();
                     filter.getControllerId().add(event.getTargetId());
                     filter.setNotController(false);
diff --git a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
index ef5b85b8134..83a3157adbe 100644
--- a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
+++ b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
@@ -100,6 +100,7 @@ class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl<HammerOfRuinTrig
             Permanent p = game.getPermanent(event.getSourceId());
             if (damageEvent.isCombatDamage() && p != null && p.getAttachments().contains(this.getSourceId())) {
                 FilterPermanent filter = (FilterPermanent)getTargets().get(0).getFilter();
+                filter.getControllerId().clear();
                 filter.getControllerId().add(event.getPlayerId());
 			    return true;
             }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/TestGravecrawler.java b/Mage.Tests/src/test/java/org/mage/test/cards/TestGravecrawler.java
index 4c63dd00e3e..d719c7efe5c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/TestGravecrawler.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/TestGravecrawler.java
@@ -1,8 +1,6 @@
 package org.mage.test.cards;
 
 import mage.Constants;
-import mage.Constants.PhaseStep;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/TestHavengulLich.java b/Mage.Tests/src/test/java/org/mage/test/cards/TestHavengulLich.java
index 06ac53c34bc..77e9f10ce07 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/TestHavengulLich.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/TestHavengulLich.java
@@ -1,15 +1,6 @@
 package org.mage.test.cards;
 
-import java.util.ArrayList;
-import java.util.List;
 import mage.Constants;
-import mage.Constants.PhaseStep;
-import mage.abilities.Ability;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.effects.common.DamageTargetEffect;
-import mage.target.common.TargetCreatureOrPlayer;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
diff --git a/Mage/src/mage/Constants.java b/Mage/src/mage/Constants.java
index 0c7a4fdf85d..dfc832ccae4 100644
--- a/Mage/src/mage/Constants.java
+++ b/Mage/src/mage/Constants.java
@@ -325,7 +325,7 @@ public final class Constants {
 		PutCreatureInPlay(true),
 		PutCardInPlay(true),
 		PutLandInPlay(true),
-		GainControl(true),
+		GainControl(false),
 		DrawCard(true),
 		Discard(false),
 		Sacrifice(false),
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index b968248ae8c..5e7cb560a90 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -885,8 +885,10 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
 					if (attachment != null && !(attachment.getSubtype().contains("Aura") ||
 							attachment.getSubtype().contains("Equipment") ||
 							attachment.getSubtype().contains("Fortification"))) {
-						if (perm.removeAttachment(attachment.getId(), this))
+						if (perm.removeAttachment(attachment.getId(), this)) {
 							somethingHappened = true;
+                            break;
+                        }
 					}
 				}
 			}