From 29c7354bb4390066d2c23c98bf33f91615b3d56e Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 10 May 2014 11:34:11 +0200
Subject: [PATCH] * Fixed some bugs in damage prevention handling.

---
 .../effects/PreventionEffectImpl.java         |  3 +-
 .../common/PreventDamageSourceEffect.java     | 38 +++----------------
 Mage/src/mage/game/GameImpl.java              |  2 +-
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/Mage/src/mage/abilities/effects/PreventionEffectImpl.java b/Mage/src/mage/abilities/effects/PreventionEffectImpl.java
index 9fea34802c..b639452fb1 100644
--- a/Mage/src/mage/abilities/effects/PreventionEffectImpl.java
+++ b/Mage/src/mage/abilities/effects/PreventionEffectImpl.java
@@ -60,6 +60,7 @@ public abstract class PreventionEffectImpl<T extends PreventionEffectImpl<T>> ex
         this.effectType = EffectType.PREVENTION;
         this.amountToPrevent = amountToPrevent;
         this.onlyCombat = onlyCombat;
+        this.consumable = consumable;
     }
 
     public PreventionEffectImpl(final PreventionEffectImpl effect) {
@@ -83,7 +84,7 @@ public abstract class PreventionEffectImpl<T extends PreventionEffectImpl<T>> ex
                 amountToPrevent = preventionData.getRemainingAmount();
             }
             if (amountToPrevent == 0) {
-                this.used = true;
+                this.discard();
             }            
         }
         return preventionData;
diff --git a/Mage/src/mage/abilities/effects/common/PreventDamageSourceEffect.java b/Mage/src/mage/abilities/effects/common/PreventDamageSourceEffect.java
index 45fb3e8347..dbfb2d24aa 100644
--- a/Mage/src/mage/abilities/effects/common/PreventDamageSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/PreventDamageSourceEffect.java
@@ -27,10 +27,10 @@
  */
 package mage.abilities.effects.common;
 
-import mage.constants.Duration;
 import mage.abilities.Ability;
 import mage.abilities.Mode;
 import mage.abilities.effects.PreventionEffectImpl;
+import mage.constants.Duration;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
@@ -40,16 +40,12 @@ import mage.game.events.GameEvent;
  */
 public class PreventDamageSourceEffect extends PreventionEffectImpl<PreventDamageSourceEffect> {
 
-    private int amount;
-
-    public PreventDamageSourceEffect(Duration duration, int amount) {
-        super(duration);
-        this.amount = amount;
+    public PreventDamageSourceEffect(Duration duration, int amountToPrevent) {
+        super(duration, amountToPrevent, false);
     }
 
     public PreventDamageSourceEffect(final PreventDamageSourceEffect effect) {
         super(effect);
-        this.amount = effect.amount;
     }
 
     @Override
@@ -62,31 +58,9 @@ public class PreventDamageSourceEffect extends PreventionEffectImpl<PreventDamag
         return true;
     }
 
-    @Override
-    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-        GameEvent preventEvent = new GameEvent(GameEvent.EventType.PREVENT_DAMAGE, source.getSourceId(), source.getId(), source.getControllerId(), event.getAmount(), false);
-        if (!game.replaceEvent(preventEvent)) {
-            if (event.getAmount() >= this.amount) {
-                int damage = amount;
-                event.setAmount(event.getAmount() - amount);
-                this.used = true;
-                game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, source.getSourceId(), source.getId(), source.getControllerId(), damage));
-            } else {
-                int damage = event.getAmount();
-                event.setAmount(0);
-                amount -= damage;
-                game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, source.getSourceId(), source.getId(), source.getControllerId(), damage));
-            }
-        }
-        return false;
-    }
-
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (!this.used && super.applies(event, source, game) && event.getTargetId().equals(source.getSourceId())) {
-            return true;
-        }
-        return false;
+        return super.applies(event, source, game) && event.getTargetId().equals(source.getSourceId());
     }
 
     @Override
@@ -95,10 +69,10 @@ public class PreventDamageSourceEffect extends PreventionEffectImpl<PreventDamag
             return staticText;
         }
         StringBuilder sb = new StringBuilder();
-        if (amount == Integer.MAX_VALUE) {
+        if (amountToPrevent == Integer.MAX_VALUE) {
             sb.append("Prevent all damage that would be dealt to ");
         } else {
-            sb.append("Prevent the next ").append(amount).append(" damage that would be dealt to ");
+            sb.append("Prevent the next ").append(amountToPrevent).append(" damage that would be dealt to ");
         }
         sb.append("{source} ").append(duration.toString());
         return sb.toString();
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index d7b67903a3..c40029046b 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -1893,7 +1893,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
         } 
         if (amountToPrevent != Integer.MAX_VALUE) {
             // set remaining amount
-            event.setData(Integer.toString(amountToPrevent -= result.getPreventedDamage()));
+            result.setRemainingAmount(amountToPrevent -= result.getPreventedDamage());
         }            
         MageObject damageSource = game.getObject(damageEvent.getSourceId());
         MageObject preventionSource = game.getObject(source.getSourceId());