diff --git a/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java b/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java index 7eacc835248..bd673354f7b 100644 --- a/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java +++ b/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java @@ -36,7 +36,7 @@ public final class BonecrusherGiant extends AdventureCard { // Stomp // Damage can’t be prevented this turn. Stomp deals 2 damage to any target. - this.getSpellCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn", false, false)); + this.getSpellCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); this.getSpellCard().getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellCard().getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -49,4 +49,4 @@ public final class BonecrusherGiant extends AdventureCard { public BonecrusherGiant copy() { return new BonecrusherGiant(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CallInAProfessional.java b/Mage.Sets/src/mage/cards/c/CallInAProfessional.java index ab5af6a9c77..19faa87a99d 100644 --- a/Mage.Sets/src/mage/cards/c/CallInAProfessional.java +++ b/Mage.Sets/src/mage/cards/c/CallInAProfessional.java @@ -22,7 +22,7 @@ public final class CallInAProfessional extends CardImpl { // Players can't gain life this turn. Damage can't be prevented this turn. Call In a Professional deals 3 damage to any target. this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DamageCantBePreventedEffect( - Duration.EndOfTurn, "Damage can't be prevented this turn", true, false + Duration.EndOfTurn, "Damage can't be prevented this turn" )); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/e/EverlastingTorment.java b/Mage.Sets/src/mage/cards/e/EverlastingTorment.java index 7090898426c..9df71fffd19 100644 --- a/Mage.Sets/src/mage/cards/e/EverlastingTorment.java +++ b/Mage.Sets/src/mage/cards/e/EverlastingTorment.java @@ -29,8 +29,7 @@ public final class EverlastingTorment extends CardImpl { // Damage can't be prevented. this.addAbility(new SimpleStaticAbility(new DamageCantBePreventedEffect( - Duration.WhileOnBattlefield, "Damage can't be prevented", - true, false + Duration.WhileOnBattlefield, "Damage can't be prevented" ))); // All damage is dealt as though its source had wither. diff --git a/Mage.Sets/src/mage/cards/f/FearFireFoes.java b/Mage.Sets/src/mage/cards/f/FearFireFoes.java index b811810a373..553b13d8aff 100644 --- a/Mage.Sets/src/mage/cards/f/FearFireFoes.java +++ b/Mage.Sets/src/mage/cards/f/FearFireFoes.java @@ -32,8 +32,7 @@ public final class FearFireFoes extends CardImpl { // Damage can't be prevented this turn. Fear, Fire, Foes! deals X damage to target creature and 1 damage to each other creature with the same controller. this.getSpellAbility().addEffect(new DamageCantBePreventedEffect( - Duration.EndOfTurn, "Damage can't be prevented this turn", - true, false + Duration.EndOfTurn, "Damage can't be prevented this turn" )); this.getSpellAbility().addEffect(new DamageTargetEffect(ManacostVariableValue.REGULAR)); this.getSpellAbility().addEffect(new FearFireFoesEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FlaringPain.java b/Mage.Sets/src/mage/cards/f/FlaringPain.java index 4e75a1d14b3..bbfac6f7119 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringPain.java +++ b/Mage.Sets/src/mage/cards/f/FlaringPain.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TimingRule; /** * @@ -22,7 +21,7 @@ public final class FlaringPain extends CardImpl { // Damage can't be prevented this turn. - this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn", false, false)); + this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); // Flashback {R} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/i/InsultInjury.java b/Mage.Sets/src/mage/cards/i/InsultInjury.java index ea490acee1c..0ee8c5cade2 100644 --- a/Mage.Sets/src/mage/cards/i/InsultInjury.java +++ b/Mage.Sets/src/mage/cards/i/InsultInjury.java @@ -32,7 +32,7 @@ public final class InsultInjury extends SplitCard { // Insult // Damage can't be prevented this turn. If a source you control would deal damage this turn it deals // double that damage instead. - getLeftHalfCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn", true, false)); + getLeftHalfCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); getLeftHalfCard().getSpellAbility().addEffect(new InsultDoubleDamageEffect()); // to diff --git a/Mage.Sets/src/mage/cards/s/Skullcrack.java b/Mage.Sets/src/mage/cards/s/Skullcrack.java index ddb7a10942f..4686e6efaa6 100644 --- a/Mage.Sets/src/mage/cards/s/Skullcrack.java +++ b/Mage.Sets/src/mage/cards/s/Skullcrack.java @@ -22,7 +22,7 @@ public final class Skullcrack extends CardImpl { // Players can't gain life this turn. Damage can't be prevented this turn. Skullcrack deals 3 damage to target player. this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn", true, false)); + this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/w/WildSlash.java b/Mage.Sets/src/mage/cards/w/WildSlash.java index f12b5300ae5..288ff61a42a 100644 --- a/Mage.Sets/src/mage/cards/w/WildSlash.java +++ b/Mage.Sets/src/mage/cards/w/WildSlash.java @@ -24,7 +24,7 @@ public final class WildSlash extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); // Ferocious If you control a creature with power 4 or greater, damage can't be prevented this turn. - ContinuousRuleModifyingEffect effect = new DamageCantBePreventedEffect(Duration.EndOfTurn, "damage can't be prevented this turn", false, false); + ContinuousRuleModifyingEffect effect = new DamageCantBePreventedEffect(Duration.EndOfTurn, "damage can't be prevented this turn"); effect.setText("Ferocious — If you control a creature with power 4 or greater, damage can't be prevented this turn.
"); this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect(effect, new LockedInCondition(FerociousCondition.instance))); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java index 9259d2904a3..ce2f33873ad 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java @@ -9,8 +9,8 @@ import mage.game.events.GameEvent; public class DamageCantBePreventedEffect extends ContinuousRuleModifyingEffectImpl { - public DamageCantBePreventedEffect(Duration duration, String staticText, boolean messageToUser, boolean messageToLog) { - super(duration, Outcome.Benefit, messageToUser, messageToLog); + public DamageCantBePreventedEffect(Duration duration, String staticText) { + super(duration, Outcome.Benefit); this.staticText = staticText; }