Foul Tongue Shriek bug fix - filters attacking creatures you control

Mage.Sets/src/mage/sets/dragonsoftarkir/FoulTongueShriek.java

@@ -29,12 +29,15 @@ package mage.sets.dragonsoftarkir;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.dynamicvalue.common.AttackingCreatureCount;
+import mage.abilities.dynamicvalue.common.AttackingFilterCreatureCount;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetOpponent;
@@ -67,6 +70,11 @@ public class FoulTongueShriek extends CardImpl {
 
 class FoulTongueShriekEffect extends OneShotEffect {
     
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
+    static {
+        filter.add(new ControllerPredicate(TargetController.YOU));
+    }
+    
     public FoulTongueShriekEffect() {
         super(Outcome.Benefit);
         this.staticText = "Target opponent loses 1 life for each attacking creature you control. You gain that much life";
@@ -86,7 +94,7 @@ class FoulTongueShriekEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         Player targetOpponent = game.getPlayer(getTargetPointer().getFirst(game, source));
         if (controller != null && targetOpponent != null) {
-            int amount = new AttackingCreatureCount().calculate(game, source, this);
+            int amount = new AttackingFilterCreatureCount(filter).calculate(game, source, this);
             if (amount > 0) {
                 targetOpponent.loseLife(amount, game);
                 controller.gainLife(amount, game);

Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingFilterCreatureCount.java

@@ -0,0 +1,91 @@
+/*
+ *  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 mage.abilities.dynamicvalue.common;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.combat.CombatGroup;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class AttackingFilterCreatureCount implements DynamicValue {
+
+    private FilterCreaturePermanent filter;
+    private String message;
+    
+    public AttackingFilterCreatureCount(FilterCreaturePermanent filter) {
+        this(filter, "attacking creature");
+    }
+
+    public AttackingFilterCreatureCount(FilterCreaturePermanent filter, String message) {
+        this.filter = filter;
+        this.message = message;
+    }
+
+    public AttackingFilterCreatureCount(final AttackingFilterCreatureCount dynamicValue) {
+        super();
+        this.message = dynamicValue.message;
+        this.filter = dynamicValue.filter;
+    }
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        int count = 0;
+        for (CombatGroup combatGroup : game.getCombat().getGroups()) {
+            for (UUID permId : combatGroup.getAttackers()) {
+                Permanent attacker = game.getPermanent(permId);
+                if (filter.match(attacker, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game)) {                    
+                    count++;
+                }
+            }
+        }
+        return count;
+    }
+
+    @Override
+    public AttackingFilterCreatureCount copy() {
+        return new AttackingFilterCreatureCount(this);
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        return "X";
+    }
+}