Used new MageObjectReference class for DamagedByWatcher damaged object comparison.

Mage/src/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java

@@ -0,0 +1,101 @@
+/*
+ *  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.effects.common.replacement;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.cards.Card;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.watchers.common.DamagedByWatcher;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class DealtDamageToCreatureBySourceDies extends ReplacementEffectImpl {
+
+    public DealtDamageToCreatureBySourceDies(Card card, Duration duration) {
+        super(Duration.WhileOnBattlefield, Outcome.Exile);
+        card.addWatcher(new DamagedByWatcher());
+        if (card.getCardType().contains(CardType.CREATURE)) {
+            staticText = "If a creature dealt damage by {this} this turn would die, exile it instead";
+        } else {
+            staticText = "If a creature dealt damage this way would die this turn, exile it instead";
+        }
+    }
+
+    public DealtDamageToCreatureBySourceDies(final DealtDamageToCreatureBySourceDies effect) {
+        super(effect);
+    }
+
+    @Override
+    public DealtDamageToCreatureBySourceDies copy() {
+        return new DealtDamageToCreatureBySourceDies(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        Permanent permanent = ((ZoneChangeEvent)event).getTarget();
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null && permanent != null) {
+            return controller.moveCardToExileWithInfo(permanent, null, "", source.getSourceId(), game, Zone.BATTLEFIELD);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        if (event.getType().equals(EventType.ZONE_CHANGE)) {
+            ZoneChangeEvent  zce = (ZoneChangeEvent) event;
+            if (zce.isDiesEvent()) {
+                DamagedByWatcher watcher = (DamagedByWatcher) game.getState().getWatchers().get("DamagedByWatcher", source.getSourceId());
+                if (watcher != null) {
+                    return watcher.wasDamaged(zce.getTarget());
+                }
+            }
+        }
+        return false;
+    }
+
+}

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

@@ -27,23 +27,25 @@
  */
 package mage.watchers.common;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import mage.MageObject;
+import mage.MageObjectReference;
 import mage.constants.WatcherScope;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
 import mage.watchers.Watcher;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
 public class DamagedByWatcher extends Watcher {
 
-    public List<UUID> damagedCreatures = new ArrayList<>();
+    public Set<MageObjectReference> damagedCreatures = new HashSet<>();
 
     public DamagedByWatcher() {
         super("DamagedByWatcher", WatcherScope.CARD);
@@ -61,9 +63,10 @@ public class DamagedByWatcher extends Watcher {
 
     @Override
     public void watch(GameEvent event, Game game) {
-        if (event.getType() == EventType.DAMAGED_CREATURE) {
-            if (sourceId.equals(event.getSourceId()) && !damagedCreatures.contains(event.getTargetId())) {
-                damagedCreatures.add(event.getTargetId());
+        if (event.getType() == EventType.DAMAGED_CREATURE && sourceId.equals(event.getSourceId())) {
+            MageObjectReference mor = new MageObjectReference(event.getTargetId(), game);
+            if (!damagedCreatures.contains(mor)) {
+                damagedCreatures.add(mor);
             }
         }
     }
@@ -74,4 +77,15 @@ public class DamagedByWatcher extends Watcher {
         damagedCreatures.clear();
     }
 
+    public boolean wasDamaged(UUID sourceId, Game game) {
+        MageObject mageObject = game.getObject(sourceId);
+        if (mageObject instanceof Permanent) {
+            return wasDamaged((Permanent) mageObject);
+        }
+        return false;
+    }
+
+    public boolean wasDamaged(Permanent permanent) {
+        return damagedCreatures.contains(new MageObjectReference(permanent));
+    }
 }