From c00d86dd8dd4b8d203c63d7c5f90d8c495deeb24 Mon Sep 17 00:00:00 2001
From: LoneFox <lonefox@kapsi.fi>
Date: Tue, 30 Jun 2015 18:43:08 +0300
Subject: [PATCH] Fix Ambush Commander. It was animating each player's Forests
 instead of just your own.

---
 .../mage/sets/elvesvsgoblins/AmbushCommander.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java
index f4e8e374ac7..673340d63a6 100644
--- a/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java
+++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java
@@ -41,8 +41,8 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.permanent.token.Token;
 import mage.target.common.TargetControlledCreaturePermanent;
@@ -55,9 +55,11 @@ import mage.target.common.TargetCreaturePermanent;
 public class AmbushCommander extends CardImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an Elf");
+    private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("Forests you control");
 
     static {
         filter.add(new SubtypePredicate("Elf"));
+        filter2.add(new SubtypePredicate("Forest"));
     }
 
     public AmbushCommander(UUID ownerId) {
@@ -69,9 +71,11 @@ public class AmbushCommander extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Forests you control are 1/1 green Elf creatures that are still lands.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect(new AmbushCommanderToken(), "lands", new FilterPermanent("Forest", "Forests"), Duration.WhileOnBattlefield)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect(new AmbushCommanderToken(),
+            "lands", filter2, Duration.WhileOnBattlefield)));
         // {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3,3, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3,3, Duration.EndOfTurn),
+            new ManaCostsImpl("{1}{G}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filter, true)));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
@@ -97,4 +101,4 @@ class AmbushCommanderToken extends Token {
         color.setGreen(true);
     }
 
-}
\ No newline at end of file
+}