From 1bb1df32b556c9ec3cf10bccb804bfa187b2b8cd Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 25 May 2012 19:00:05 +0400
Subject: [PATCH] Updated lose ability test and corresponding effects.

---
 .../org/mage/test/cards/abilities/lose/LoseAbilityTest.java | 6 +++---
 .../common/continious/GainAbilityAttachedEffect.java        | 3 ++-
 .../common/continious/LoseAbilityAttachedEffect.java        | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java
index 942eed0e79b..2288bd625f1 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/lose/LoseAbilityTest.java
@@ -74,7 +74,7 @@ public class LoseAbilityTest extends CardTestPlayerBase {
     @Test
     public void testMultiGainVsLoseAbility() {
         addCard(Constants.Zone.BATTLEFIELD, playerA, "Air Elemental");
-        addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 5);
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 10);
         addCard(Constants.Zone.HAND, playerA, "Grounded");
         addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 10);
         addCard(Constants.Zone.HAND, playerA, "Drake Umbra", 2);
@@ -83,7 +83,7 @@ public class LoseAbilityTest extends CardTestPlayerBase {
         castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Drake Umbra", "Air Elemental");
         castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Grounded", "Air Elemental");
 
-        setStopAt(2, Constants.PhaseStep.END_TURN);
+        setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT);
         execute();
 
         assertLife(playerA, 20);
@@ -92,7 +92,7 @@ public class LoseAbilityTest extends CardTestPlayerBase {
         Permanent airElemental = getPermanent("Air Elemental", playerA.getId());
         Assert.assertNotNull(airElemental);
 
-        Assert.assertTrue(airElemental.getAttachments().size() == 3);
+        Assert.assertEquals(3, airElemental.getAttachments().size());
         // should NOT have flying
         Assert.assertFalse(airElemental.getAbilities().contains(FlyingAbility.getInstance()));
     }
diff --git a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java
index 6bd0034ac47..c85cae2a14e 100644
--- a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java
@@ -70,8 +70,9 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl<GainAbilityA
 		Permanent equipment = game.getPermanent(source.getSourceId());
 		if (equipment != null && equipment.getAttachedTo() != null) {
 			Permanent creature = game.getPermanent(equipment.getAttachedTo());
-			if (creature != null)
+			if (creature != null) {
 				creature.addAbility(ability, game);
+            }
 		}
 		return true;
 	}
diff --git a/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java
index 98caf7cdd90..5f13b3e968d 100644
--- a/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java
@@ -67,7 +67,9 @@ public class LoseAbilityAttachedEffect extends ContinuousEffectImpl<LoseAbilityA
 		if (equipment != null && equipment.getAttachedTo() != null) {
 			Permanent creature = game.getPermanent(equipment.getAttachedTo());
 			if (creature != null) {
-                creature.getAbilities().remove(ability);
+                while (creature.getAbilities().contains(ability)) {
+                    creature.getAbilities().remove(ability);
+                }
             }
 		}
 		return true;