From 0907b416cd67993d38d713ca77765303a903c01d Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Mon, 23 Jul 2012 22:43:17 +0300
Subject: [PATCH] Fixed GainAbilityAllEffect (now uses range of influence)

---
 .../continious/GainAbilityAllEffect.java      | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAllEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAllEffect.java
index fc1fe5123f8..ec1c51cc028 100644
--- a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAllEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAllEffect.java
@@ -56,6 +56,11 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl<GainAbilityAllEff
         this(ability, duration, filter, false);
     }
 
+    public GainAbilityAllEffect(Ability ability, Duration duration, FilterPermanent filter, String text) {
+        this(ability, duration, filter, false);
+        this.staticText = text;
+    }
+
     public GainAbilityAllEffect(Ability ability, Duration duration, FilterPermanent filter, boolean excludeSource) {
         super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
         this.ability = ability;
@@ -75,7 +80,7 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl<GainAbilityAllEff
     public void init(Ability source, Game game) {
         super.init(source, game);
         if (this.affectedObjectsSet) {
-            for (Permanent perm: game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
+            for (Permanent perm: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
                 if (!(excludeSource && perm.getId().equals(source.getSourceId()))) {
                     objects.add(perm.getId());
                 }
@@ -90,7 +95,7 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl<GainAbilityAllEff
 
     @Override
     public boolean apply(Game game, Ability source) {
-        for (Permanent perm: game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
+        for (Permanent perm: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
             if (!this.affectedObjectsSet || objects.contains(perm.getId())) {
                 if (!(excludeSource && perm.getId().equals(source.getSourceId()))) {
                     perm.addAbility(ability, game);
@@ -102,16 +107,17 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl<GainAbilityAllEff
 
     private void setText() {
         StringBuilder sb = new StringBuilder();
-        if (excludeSource)
+        if (excludeSource) {
             sb.append("Other ");
-                sb.append(filter.getMessage());
-                if (duration.equals(Duration.WhileOnBattlefield))
-                    sb.append(" have ");
-                else
-                    sb.append(" gain ");
+        }
+        sb.append(filter.getMessage());
+        if (duration.equals(Duration.WhileOnBattlefield)) {
+            sb.append(" have ");
+        } else {
+            sb.append(" gain ");
+        }
         sb.append(ability.getRule());
         sb.append(" ").append(duration.toString());
         staticText = sb.toString();
     }
-
 }