Merge branch 'master' of https://github.com/magefree/mage.git

Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java

@@ -31,13 +31,12 @@ package mage.sets.championsofkamigawa;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.effects.common.ExileTargetEffect;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -46,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent;
 import mage.watchers.common.PlayerDamagedBySourceWatcher;
 
 /**
- * @author LevelX
+ * @author LevelX2
  */
 public class Reciprocate extends CardImpl<Reciprocate> {
 
@@ -84,7 +83,7 @@ class ReciprocateTarget<T extends TargetCreaturePermanent<T>> extends TargetPerm
     @Override
     public boolean canTarget(UUID id, Ability source, Game game) {
         PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource",source.getControllerId());
-        if (watcher != null && watcher.damageSources.contains(id)) {
+        if (watcher != null && watcher.hasSourceDoneDamage(id, game)) {
             return super.canTarget(id, source, game);
         }
         return false;
@@ -97,7 +96,7 @@ class ReciprocateTarget<T extends TargetCreaturePermanent<T>> extends TargetPerm
         PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource", sourceControllerId);
         for (UUID targetId : availablePossibleTargets) {
             Permanent permanent = game.getPermanent(targetId);
-            if(permanent != null && watcher != null && watcher.damageSources.contains(targetId)){
+            if(permanent != null && watcher != null && watcher.hasSourceDoneDamage(targetId, game)){
                 possibleTargets.add(targetId);
             }
         }
@@ -115,7 +114,7 @@ class ReciprocateTarget<T extends TargetCreaturePermanent<T>> extends TargetPerm
         PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource", sourceControllerId);
         for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, sourceControllerId, sourceId, game)) {
                 if (!targets.containsKey(permanent.getId()) && permanent.canBeTargetedBy(targetSource, sourceControllerId, game)
-                    && watcher != null && watcher.damageSources.contains(permanent.getId())) {
+                    && watcher != null && watcher.hasSourceDoneDamage(permanent.getId(), game)) {
                         count++;
                         if (count >= remainingTargets) {
                             return true;

Mage.Sets/src/mage/sets/championsofkamigawa/WickedAkuba.java

@@ -28,17 +28,16 @@
 package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.ColoredManaSymbol;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.filter.FilterPlayer;
 import mage.filter.predicate.ObjectSourcePlayer;
 import mage.filter.predicate.ObjectSourcePlayerPredicate;
@@ -89,8 +88,8 @@ class WickedAkubaPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePl
     @Override
     public boolean apply(ObjectSourcePlayer<Player> input, Game game) {
         PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource", input.getObject().getId());
-        if (watcher != null && watcher.damageSources.contains(input.getSourceId())) {
+        if (watcher != null) {
-            return true;
+            return watcher.hasSourceDoneDamage(input.getSourceId(), game);
         }
 
         return false;

Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java

@@ -30,9 +30,6 @@ package mage.sets.conflux;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.MageObject;
 import mage.abilities.Ability;
@@ -41,6 +38,9 @@ import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.keyword.ExaltedAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -48,7 +48,6 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 import mage.watchers.common.PlayerDamagedBySourceWatcher;
 
-
 /**
  *
  * @author BetaSteward_at_googlemail.com
@@ -103,7 +102,7 @@ class GiltspireAvengerTarget<T extends TargetCreaturePermanent<T>> extends Targe
     @Override
     public boolean canTarget(UUID id, Ability source, Game game) {
         PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource",source.getControllerId());
-        if (watcher != null && watcher.damageSources.contains(id)) {
+        if (watcher != null && watcher.hasSourceDoneDamage(id, game)) {
             return super.canTarget(id, source, game);
         }
         return false;
@@ -116,7 +115,7 @@ class GiltspireAvengerTarget<T extends TargetCreaturePermanent<T>> extends Targe
         PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource", sourceControllerId);
         for (UUID targetId : availablePossibleTargets) {
             Permanent permanent = game.getPermanent(targetId);
-            if(permanent != null && watcher != null && watcher.damageSources.contains(targetId)){
+            if(permanent != null && watcher != null && watcher.hasSourceDoneDamage(targetId, game)){
                 possibleTargets.add(targetId);
             }
         }
@@ -134,7 +133,7 @@ class GiltspireAvengerTarget<T extends TargetCreaturePermanent<T>> extends Targe
         PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource", sourceControllerId);
         for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, sourceControllerId, sourceId, game)) {
                 if (!targets.containsKey(permanent.getId()) && permanent.canBeTargetedBy(targetSource, sourceControllerId, game)
-                    && watcher != null && watcher.damageSources.contains(permanent.getId())) {
+                    && watcher != null && watcher.hasSourceDoneDamage(permanent.getId(), game)) {
                         count++;
                         if (count >= remainingTargets) {
                             return true;

Mage.Sets/src/mage/sets/mirrodin/Duplicant.java

@@ -0,0 +1,185 @@
+/*
+ *  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.sets.mirrodin;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.SubLayer;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.TokenPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author Plopman
+ */
+public class Duplicant extends CardImpl<Duplicant> {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature");
+    static {
+        filter.add(Predicates.not(new TokenPredicate()));
+    }
+    public Duplicant(UUID ownerId) {
+        super(ownerId, 165, "Duplicant", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{6}");
+        this.expansionSetCode = "MRD";
+        this.subtype.add("Shapeshifter");
+
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(4);
+
+        // Imprint - When Duplicant enters the battlefield, you may exile target nontoken creature.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect(), true, "<i>Imprint - </i>");
+        ability.addTarget(new TargetCreaturePermanent(filter));
+        this.addAbility(ability);
+        // As long as the exiled card is a creature card, Duplicant has that card's power, toughness, and creature types. It's still a Shapeshifter.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DuplicantContinuousEffect()));
+    }
+
+    public Duplicant(final Duplicant card) {
+        super(card);
+    }
+
+    @Override
+    public Duplicant copy() {
+        return new Duplicant(this);
+    }
+}
+class ExileTargetEffect extends OneShotEffect<ExileTargetEffect> {
+
+
+    public ExileTargetEffect() {
+        super(Outcome.Exile);
+    }
+
+    public ExileTargetEffect(final ExileTargetEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ExileTargetEffect copy() {
+        return new ExileTargetEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source));
+        Permanent sourcePermananent = game.getPermanent(source.getSourceId());
+        if (permanent != null) {
+            if(sourcePermananent != null){
+                sourcePermananent.imprint(permanent.getId(), game);
+                sourcePermananent.addInfo("imprint", new StringBuilder("[Imprinted card - ").append(permanent.getName()).append("]").toString());
+            }
+            return permanent.moveToExile(null, null, source.getSourceId(), game);
+        } 
+        
+        return false;
+    }
+
+    @Override
+    public String getText(Mode mode) {
+        return "you may exile target nontoken creature";
+    }
+}
+
+
+class DuplicantContinuousEffect extends ContinuousEffectImpl<DuplicantContinuousEffect> {
+
+    public DuplicantContinuousEffect() {
+        super(Duration.WhileOnBattlefield, Outcome.BoostCreature);
+        staticText = "As long as the exiled card is a creature card, Duplicant has that card's power, toughness, and creature types. It's still a Shapeshifter";         
+    }
+
+    public DuplicantContinuousEffect(final DuplicantContinuousEffect effect) {
+        super(effect);
+        }
+
+    @Override
+    public DuplicantContinuousEffect copy() {
+        return new DuplicantContinuousEffect(this);
+    }
+
+    @Override
+    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (permanent != null) {
+            if(permanent.getImprinted().size() > 0){
+                Card card = game.getCard(permanent.getImprinted().get(0));
+                if(card != null && card.getCardType().contains(CardType.CREATURE))
+                {
+                    switch (layer) {
+                        case TypeChangingEffects_4:
+                            if (sublayer == SubLayer.NA) {
+                                permanent.getSubtype().addAll(card.getSubtype());
+                            }
+
+                            break;
+                        case PTChangingEffects_7:
+                            if (sublayer == SubLayer.SetPT_7b) {
+                                 permanent.getPower().setValue(card.getPower().getValue());
+                                 permanent.getToughness().setValue(card.getToughness().getValue());
+
+                            }
+                    }
+                    return true;
+
+                    
+                }
+            }
+            
+        }
+        return false;
+    }
+    
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return false;
+    }
+       
+    @Override
+    public boolean hasLayer(Layer layer) {
+        return layer == Layer.PTChangingEffects_7 || layer == Layer.TypeChangingEffects_4;
+    }
+
+}

Mage.Sets/src/mage/sets/nemesis/TangleWire.java

@@ -0,0 +1,127 @@
+/*
+ *  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.sets.nemesis;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.FadingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.common.TargetControlledPermanent;
+
+/**
+ *
+ * @author Plopman
+ */
+public class TangleWire extends CardImpl<TangleWire> {
+
+    public TangleWire(UUID ownerId) {
+        super(ownerId, 139, "Tangle Wire", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}");
+        this.expansionSetCode = "NMS";
+
+        // Fading 4
+        this.addAbility(new FadingAbility(4, this));
+        // At the beginning of each player's upkeep, that player taps an untapped artifact, creature, or land he or she controls for each fade counter on Tangle Wire.
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new TangleWireEffect(), TargetController.ANY, false, true));
+    }
+
+    public TangleWire(final TangleWire card) {
+        super(card);
+    }
+
+    @Override
+    public TangleWire copy() {
+        return new TangleWire(this);
+    }
+}
+class TangleWireEffect extends OneShotEffect<TangleWireEffect> {
+
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped artifact, creature, or land he or she controls");
+    static{
+        filter.add(Predicates.not(new TappedPredicate()));
+    }
+    
+    TangleWireEffect() {
+        super(Outcome.Sacrifice);
+        staticText = "that player taps an untapped artifact, creature, or land he or she controls for each fade counter on Tangle Wire";
+    }
+
+    TangleWireEffect(final TangleWireEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(targetPointer.getFirst(game, source));
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (player == null || permanent == null) {
+            return false;
+        }
+        
+        int targetCount = game.getBattlefield().countAll(filter, player.getId(), game);
+        int counterCount = permanent.getCounters().getCount(CounterType.FADE);
+        int amount = Math.min(counterCount, targetCount);
+        
+        Target target = new TargetControlledPermanent(amount, amount, filter, false);
+        target.setRequired(true);
+        target.setNotTarget(true);
+
+        if (player.chooseTarget(Outcome.Tap, target, source, game)) {
+            boolean abilityApplied = false;
+
+            for (UUID uuid : target.getTargets()) {
+                Permanent selectedPermanent = game.getPermanent(uuid);
+                if ( selectedPermanent != null ) {
+                    abilityApplied |= selectedPermanent.tap(game);
+                }
+            }
+
+            return abilityApplied;
+        }
+        return false;
+    }
+
+    @Override
+    public TangleWireEffect copy() {
+        return new TangleWireEffect(this);
+    }
+}

Mage/src/mage/abilities/condition/common/DealtDamageToAnOpponent.java

@@ -45,8 +45,8 @@ public class DealtDamageToAnOpponent implements Condition {
     public boolean apply(Game game, Ability source) {
         for (UUID opponentId: game.getOpponents(source.getControllerId())) {
             PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource", opponentId);
-            if (watcher != null && watcher.damageSources.contains(source.getSourceId())) {
+            if (watcher != null) {
-                        return true;
+                return watcher.hasSourceDoneDamage(source.getSourceId(), game);
             }
         }
         return false;

Mage/src/mage/abilities/keyword/FadingAbility.java

@@ -0,0 +1,89 @@
+package mage.abilities.keyword;
+
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.cards.Card;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/*
+ * 702.31. Fading
+ *
+ * 702.31a Fading is a keyword that represents two abilities. “Fading N” means “This permanent enters the battlefield with N fade counters on it” and “At the beginning of your upkeep, remove a fade counter from this permanent. If you can’t, sacrifice the permanent.”
+ *
+ */
+
+public class FadingAbility extends EntersBattlefieldAbility {
+    
+    
+    private String ruleText;
+    
+    public FadingAbility(int fadeCounter, Card card) {
+        super(new AddCountersSourceEffect(CounterType.FADE.createInstance(fadeCounter)), "with");
+        Ability ability = new BeginningOfUpkeepTriggeredAbility(new FadingEffect(), TargetController.YOU, false);
+        ability.setRuleVisible(false);
+        card.addAbility(ability);
+        StringBuilder sb = new StringBuilder("Fading ");
+        sb.append(fadeCounter);
+        sb.append(" <i>(This permanent enters the battlefield with ")
+        .append(fadeCounter)
+        .append(" fade counters on it. ")
+        .append(" At the beginning of your upkeep, remove a fade counter from this permanent. If you can’t, sacrifice the permanent.")
+        .append(")</i>");
+        ruleText = sb.toString();
+    }
+
+    public FadingAbility(final FadingAbility ability) {
+        super(ability);
+        this.ruleText = ability.ruleText;
+    }
+
+    @Override
+    public EntersBattlefieldAbility copy() {
+        return new FadingAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        return ruleText;
+    }
+}
+class FadingEffect extends OneShotEffect<FadingEffect> {
+    FadingEffect() {
+        super(Outcome.Sacrifice);
+        staticText = "remove a fade counter from this permanent. If you can’t, sacrifice the permanent";
+    }
+
+    FadingEffect(final FadingEffect effect) {
+        super(effect);
+    }
+
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent p = game.getPermanent(source.getSourceId());
+        if (p != null) {
+            int amount = p.getCounters().getCount(CounterType.FADE);
+            if (amount > 0) {
+                p.removeCounters(CounterType.FADE.createInstance(), game);
+            }
+            else
+            {
+                p.sacrifice(source.getSourceId(), game);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public FadingEffect copy() {
+        return new FadingEffect(this);
+    }
+}

Mage/src/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java

@@ -57,15 +57,15 @@ public class DamagedPlayerThisTurnPredicate implements ObjectPlayerPredicate<Obj
         switch (controller) {
             case YOU:
                 PlayerDamagedBySourceWatcher watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource",playerId);
-                if (watcher != null && watcher.damageSources.contains(object.getId())) {
+                if (watcher != null ) {
-                    return true;
+                    return watcher.hasSourceDoneDamage(object.getId(), game);
                 }
                 break;
             case OPPONENT:
                 for (UUID opponentId : game.getOpponents(playerId)) {
                     watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource",opponentId);
-                    if (watcher != null && watcher.damageSources.contains(object.getId())) {
+                    if (watcher != null ) {
-                        return true;
+                        return watcher.hasSourceDoneDamage(object.getId(), game);
                     }
                 }
                 break;
@@ -75,8 +75,8 @@ public class DamagedPlayerThisTurnPredicate implements ObjectPlayerPredicate<Obj
                     for (UUID notYouId : you.getInRange()) {
                         if (!notYouId.equals(playerId)) {
                             watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource",notYouId);
-                            if (watcher != null && watcher.damageSources.contains(object.getId())) {
+                            if (watcher != null ) {
-                                return true;
+                                return watcher.hasSourceDoneDamage(object.getId(), game);
                             }
                         }
                     }
@@ -87,8 +87,8 @@ public class DamagedPlayerThisTurnPredicate implements ObjectPlayerPredicate<Obj
                 if (you != null) {
                     for (UUID anyId : you.getInRange()) {
                         watcher = (PlayerDamagedBySourceWatcher) game.getState().getWatchers().get("PlayerDamagedBySource",anyId);
-                        if (watcher != null && watcher.damageSources.contains(object.getId())) {
+                        if (watcher != null ) {
-                            return true;
+                            return watcher.hasSourceDoneDamage(object.getId(), game);
                         }
                     }
                 }

Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java

@@ -27,16 +27,16 @@
  */
 package mage.watchers.common;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import mage.constants.WatcherScope;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
+import mage.util.CardUtil;
 import mage.watchers.WatcherImpl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 /**
  * Watcher stores whitch sources did damage to a player
  * 
@@ -44,7 +44,7 @@ import java.util.UUID;
  */
 public class PlayerDamagedBySourceWatcher extends WatcherImpl<PlayerDamagedBySourceWatcher> {
 
-    public List<UUID> damageSources = new ArrayList<UUID>();
+    private Set<String> damageSourceIds = new HashSet<String>();
 
     public PlayerDamagedBySourceWatcher(UUID playerId) {
         super("PlayerDamagedBySource", WatcherScope.PLAYER);
@@ -53,7 +53,7 @@ public class PlayerDamagedBySourceWatcher extends WatcherImpl<PlayerDamagedBySou
 
     public PlayerDamagedBySourceWatcher(final PlayerDamagedBySourceWatcher watcher) {
         super(watcher);
-        this.damageSources.addAll(watcher.damageSources);
+        this.damageSourceIds.addAll(watcher.damageSourceIds);
     }
 
     @Override
@@ -64,15 +64,27 @@ public class PlayerDamagedBySourceWatcher extends WatcherImpl<PlayerDamagedBySou
     @Override
     public void watch(GameEvent event, Game game) {
         if (event.getType() == EventType.DAMAGED_PLAYER) {
-                        if (event.getTargetId().equals(controllerId) && !damageSources.contains(event.getSourceId())) {
+            if (event.getTargetId().equals(controllerId)) {
-                                damageSources.add(event.getSourceId());
+                damageSourceIds.add(CardUtil.getCardZoneString(null, event.getSourceId(), game));
             }
         }
     }
 
+    /**
+     * Checks if the current object with sourceId has damaged the player during the current turn.
+     * The zoneChangeCounter will be taken into account.
+     * 
+     * @param sourceId
+     * @param game
+     * @return 
+     */
+    public boolean hasSourceDoneDamage(UUID sourceId, Game game) {
+        return damageSourceIds.contains(CardUtil.getCardZoneString(null, sourceId, game));
+    }
+
     @Override
     public void reset() {
         super.reset();
-        damageSources.clear();
+        damageSourceIds.clear();
     }
 }