* CantBeCounteredControlledEffect - Fixed a bug that the counter source was not cheched correctly (e.g. it was possible to counter spells with blue counters after Autumn's Veil).

Mage.Sets/src/mage/sets/dissension/SpellSnare.java

@@ -42,6 +42,7 @@ import mage.target.TargetSpell;
  * @author Loki
  */
 public class SpellSnare extends CardImpl {
+
     private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 2");
 
     static {
@@ -52,8 +53,6 @@ public class SpellSnare extends CardImpl {
         super(ownerId, 33, "Spell Snare", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}");
         this.expansionSetCode = "DIS";
 
-        this.color.setBlue(true);
-
         // Counter target spell with converted mana cost 2.
         this.getSpellAbility().addEffect(new CounterTargetEffect());
         this.getSpellAbility().addTarget(new TargetSpell(filter));

Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java

@@ -60,9 +60,10 @@ public class AutumnsVeil extends CardImpl {
     public AutumnsVeil(UUID ownerId) {
         super(ownerId, 162, "Autumn's Veil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}");
         this.expansionSetCode = "M11";
-        this.color.setGreen(true);
+
         // Spells you control can't be countered by blue or black spells this turn
         this.getSpellAbility().addEffect(new CantBeCounteredControlledEffect(filterTarget1, filterSource, Duration.EndOfTurn));
+
         // and creatures you control can't be the targets of blue or black spells this turn.
         this.getSpellAbility().addEffect(new CantBeTargetedAllEffect(filterTarget2, filterSource, Duration.EndOfTurn));
     }

Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/AutumnsVeilTest.java

@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.abilities.oneshot.counterspell;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * Autumn's Veil - Instant {G}
+ * Spells you control can't be countered by blue or black spells this turn, and creatures
+ * you control can't be the targets of blue or black spells this turn.
+ *
+ *
+ * @author LevelX2
+ */
+
+public class AutumnsVeilTest extends CardTestPlayerBase {
+
+    /**
+     * Test that a spell can't be countered
+     *
+     */
+    @Test
+    public void testCantBeCounteredNormal() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
+        addCard(Zone.HAND, playerA, "Autumn's Veil", 1);
+        addCard(Zone.HAND, playerA, "Runeclaw Bear", 1);
+
+        addCard(Zone.HAND, playerB, "Counterspell");
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
+
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Autumn's Veil");
+
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Runeclaw Bear");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Counterspell", "Runeclaw Bear", "Runeclaw Bear");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+
+        assertGraveyardCount(playerA, "Autumn's Veil", 1);
+        assertGraveyardCount(playerB, "Counterspell", 1);
+        
+        assertPermanentCount(playerA, "Runeclaw Bear", 1);        
+
+    }
+
+}

Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java

@@ -89,11 +89,11 @@ public class CantBeCounteredControlledEffect extends ContinuousRuleModifyingEffe
     public boolean applies(GameEvent event, Ability source, Game game) {
         Spell spell = game.getStack().getSpell(event.getTargetId());
         if (spell != null && spell.getControllerId().equals(source.getControllerId())
-                && filterTarget.match(spell, game)) {
+                && filterTarget.match(spell, source.getControllerId(), game)) {
             if (filterSource == null) {
                 return true;
             } else {
-                MageObject sourceObject = game.getObject(source.getSourceId());
+                MageObject sourceObject = game.getObject(event.getSourceId());
                 if (sourceObject != null && filterSource.match(sourceObject, game)) {
                     return true;
                 }

Mage/src/mage/game/events/GameEvent.java

@@ -104,6 +104,7 @@ public class GameEvent {
             flag        indicates a special condition (e.g. TRUE if it's a colored mana from Cavern of Souls)
         */
         MANA_PAYED, 
+
         LOSES, LOST, WINS,
         TARGET, TARGETED,
         COUNTER, COUNTERED,