diff --git a/Mage.Sets/src/mage/sets/morningtide/PacksDisdain.java b/Mage.Sets/src/mage/sets/morningtide/PacksDisdain.java index afdbd1e8266..0cdd67f4145 100644 --- a/Mage.Sets/src/mage/sets/morningtide/PacksDisdain.java +++ b/Mage.Sets/src/mage/sets/morningtide/PacksDisdain.java @@ -78,7 +78,7 @@ class PacksDisdainEffect extends OneShotEffect { PacksDisdainEffect() { super(Outcome.UnboostCreature); - this.staticText = "Choose a creature type. Target creature gets -1/-1 until end of turn for each permanent of the chosen type you control."; + this.staticText = "Choose a creature type. Target creature gets -1/-1 until end of turn for each permanent of the chosen type you control"; } PacksDisdainEffect(final PacksDisdainEffect effect) { @@ -108,6 +108,7 @@ class PacksDisdainEffect extends OneShotEffect { ContinuousEffect effect = new BoostTargetEffect(negativePermanentsCount, negativePermanentsCount, Duration.EndOfTurn, true); effect.setTargetPointer(new FixedTarget(source.getFirstTarget())); game.addEffect(effect, source); + return true; } return false; } diff --git a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java index 56d3abdb7f0..7ac272e8e28 100644 --- a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java @@ -19,17 +19,18 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl { private boolean setTargetPointer; public DiesCreatureTriggeredAbility(Effect effect, boolean optional) { - this(effect, optional, new FilterCreaturePermanent("a creature")); + this(effect, optional, false); } public DiesCreatureTriggeredAbility(Effect effect, boolean optional, boolean another) { - this(effect, optional, new FilterCreaturePermanent(optional ? "another creature" : "a creature")); - filter.add(new AnotherPredicate()); + this(effect, optional, another, false); } public DiesCreatureTriggeredAbility(Effect effect, boolean optional, boolean another, boolean setTargetPointer) { - this(effect, optional, new FilterCreaturePermanent(optional ? "another creature" : "a creature")); - filter.add(new AnotherPredicate()); + this(effect, optional, new FilterCreaturePermanent(another ? "another creature" : "a creature")); + if (another) { + filter.add(new AnotherPredicate()); + } this.setTargetPointer = setTargetPointer; } diff --git a/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java index 5a44e47ff86..9e4d08e6508 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java @@ -3,7 +3,6 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ - package mage.abilities.costs.common; import java.util.UUID; @@ -36,7 +35,7 @@ public class GainLifeOpponentCost extends CostImpl { public GainLifeOpponentCost(int amount) { this.amount = amount; - this.text = new StringBuilder("an opponent gains ").append(amount).append(" life").toString(); + this.text = "an opponent gains " + amount + " life"; } public GainLifeOpponentCost(GainLifeOpponentCost cost) {