From 0357dcb59d16999b50b24fe2b9cd2b2e8f02b602 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 27 Sep 2013 16:14:13 +0200 Subject: [PATCH] Prevented 0 damage prevention events. --- .../src/main/java/mage/server/util/resources/config.xml | 2 +- Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java | 2 +- .../mage/abilities/effects/common/PreventAllDamageEffect.java | 4 ++-- Mage/src/mage/game/permanent/PermanentImpl.java | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/util/resources/config.xml b/Mage.Server/src/main/java/mage/server/util/resources/config.xml index f4e9ca7c47b..7e290a38c4a 100644 --- a/Mage.Server/src/main/java/mage/server/util/resources/config.xml +++ b/Mage.Server/src/main/java/mage/server/util/resources/config.xml @@ -1,7 +1,7 @@ - + diff --git a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java index 4b2f8dc5600..39fac22f45a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java +++ b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java @@ -59,7 +59,7 @@ public class NimbleMongoose extends CardImpl { // Shroud this.addAbility(ShroudAbility.getInstance()); // Threshold - Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "{this} gets +2/+2 as long as seven or more cards are in your graveyard"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), " Threshold - {this} gets +2/+2 as long as seven or more cards are in your graveyard"))); } public NimbleMongoose(final NimbleMongoose card) { diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageEffect.java b/Mage/src/mage/abilities/effects/common/PreventAllDamageEffect.java index 1744ba5edf8..2f81af4508c 100644 --- a/Mage/src/mage/abilities/effects/common/PreventAllDamageEffect.java +++ b/Mage/src/mage/abilities/effects/common/PreventAllDamageEffect.java @@ -52,7 +52,7 @@ public class PreventAllDamageEffect extends PreventionEffectImpl 0) { DamageEvent damageEvent = (DamageEvent) event; if (damageEvent.isCombatDamage() || !onlyCombat) { if (filter == null) { diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/mage/game/permanent/PermanentImpl.java index f72e9858cc9..b10b04a25ec 100644 --- a/Mage/src/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/mage/game/permanent/PermanentImpl.java @@ -619,6 +619,7 @@ public abstract class PermanentImpl> extends CardImpl */ private int damage(int damageAmount, UUID sourceId, Game game, boolean preventable, boolean combat, boolean markDamage, ArrayList appliedEffects) { int damageDone = 0; + // because of "Doran, the Siege Tower" we can't check here for 0 damage. if (canDamage(game.getObject(sourceId), game)) { if (cardType.contains(CardType.PLANESWALKER)) { damageDone = damagePlaneswalker(damageAmount, sourceId, game, preventable, combat, markDamage, appliedEffects);