From 81de9eb5c85c2854ea79e6f6ac5fe1d82f4a2d1a Mon Sep 17 00:00:00 2001
From: Neil Gentleman <ngentleman@gmail.com>
Date: Tue, 27 Oct 2015 22:25:24 -0700
Subject: [PATCH] DealtDamageToCreatureBySourceDies replaces per-card effect

---
 .../sets/avacynrestored/PillarOfFlame.java    | 48 -------------------
 .../championsofkamigawa/YamabushisStorm.java  | 42 ----------------
 2 files changed, 90 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java
index 014284bd8e5..ed8b8b3b02c 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java
@@ -74,51 +74,3 @@ public class PillarOfFlame extends CardImpl {
         return new PillarOfFlame(this);
     }
 }
-
-class PillarOfFlameEffect extends ReplacementEffectImpl {
-
-    public PillarOfFlameEffect() {
-        super(Duration.EndOfTurn, Outcome.Exile);
-        staticText = "If a creature dealt damage this way would die this turn, exile it instead";
-    }
-
-    public PillarOfFlameEffect(final PillarOfFlameEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public PillarOfFlameEffect copy() {
-        return new PillarOfFlameEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return true;
-    }
-
-    @Override
-    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-        Player controller = game.getPlayer(source.getControllerId());
-        Permanent permanent = ((ZoneChangeEvent) event).getTarget();
-        if (controller != null && permanent != null) {
-            return controller.moveCards(permanent, Zone.BATTLEFIELD, Zone.EXILED, source, game);
-        }
-        return false;
-    }
-
-    @Override
-    public boolean checksEventType(GameEvent event, Game game) {
-        return event.getType() == EventType.ZONE_CHANGE;
-    }
-    
-    @Override
-    public boolean applies(GameEvent event, Ability source, Game game) {
-        if (((ZoneChangeEvent) event).isDiesEvent()) {
-            DamagedByWatcher watcher = (DamagedByWatcher) game.getState().getWatchers().get("DamagedByWatcher", source.getSourceId());
-            if (watcher != null) {
-                return watcher.wasDamaged(event.getTargetId(), game);
-            }
-        }
-        return false;
-    }
-}
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java
index 9ec4a27bccf..ad1ceef375e 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java
@@ -77,45 +77,3 @@ public class YamabushisStorm extends CardImpl {
     }
 
 }
-
-class YamabushisStormEffect extends ReplacementEffectImpl {
-
-    public YamabushisStormEffect() {
-        super(Duration.EndOfTurn, Outcome.Exile);
-        staticText = "If a creature dealt damage this way would die this turn, exile it instead";
-    }
-
-    public YamabushisStormEffect(final YamabushisStormEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public YamabushisStormEffect copy() {
-        return new YamabushisStormEffect(this);
-    }
-
-    @Override
-    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-        Player controller = game.getPlayer(source.getControllerId());
-        Permanent permanent = ((ZoneChangeEvent) event).getTarget();
-        if (controller != null && permanent != null) {
-            return controller.moveCardToExileWithInfo(permanent, null, "", source.getSourceId(), game, Zone.BATTLEFIELD, true);
-        }
-        return false;                    
-    }
-
-    @Override
-    public boolean checksEventType(GameEvent event, Game game) {
-        return event.getType() == EventType.ZONE_CHANGE;
-    }
-
-    @Override
-    public boolean applies(GameEvent event, Ability source, Game game) {
-        if (((ZoneChangeEvent) event).isDiesEvent()) {
-            DamagedByWatcher watcher = (DamagedByWatcher) game.getState().getWatchers().get("DamagedByWatcher", source.getSourceId());
-            return watcher != null && watcher.wasDamaged(event.getTargetId(), game);
-        }
-        return false;
-    }
-
-}