diff --git a/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java b/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java index 4b450b29a81..faa322481ac 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; -import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterCreaturePermanent; /** * @@ -56,7 +56,7 @@ public class MadrushCyclops extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent()))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); } public MadrushCyclops (final MadrushCyclops card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java index 2d267a9780c..222ad3d328c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class MelokuTheCloudedMirror extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("land"); public MelokuTheCloudedMirror(UUID ownerId) { super(ownerId, 74, "Meloku the Clouded Mirror", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}"); diff --git a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java index 8cfa8e10972..ceb5b16aa61 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java +++ b/Mage.Sets/src/mage/sets/innistrad/HamletCaptain.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class HamletCaptain extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creatures"); static { filter.add(new SubtypePredicate("Human")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java index 472aa452e0e..874dedaf21e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java +++ b/Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java @@ -36,6 +36,7 @@ import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; +import mage.filter.common.FilterControlledCreaturePermanent; /** * @@ -47,7 +48,7 @@ public class FamiliarsRuse extends CardImpl { super(ownerId, 64, "Familiar's Ruse", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "LRW"; this.color.setBlue(true); - this.getSpellAbility().addCost(new ReturnToHandTargetCost(new TargetControlledCreaturePermanent())); + this.getSpellAbility().addCost(new ReturnToHandTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("creature"),false))); this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java b/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java index db7d4a6e617..b209dc1d1bb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java +++ b/Mage.Sets/src/mage/sets/magic2010/BurstOfSpeed.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.constants.Duration; -import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterCreaturePermanent; /** * @@ -47,7 +47,7 @@ public class BurstOfSpeed extends CardImpl { super(ownerId, 129, "Burst of Speed", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } public BurstOfSpeed(final BurstOfSpeed card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java b/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java index bcb3a6ccc20..044514da645 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java +++ b/Mage.Sets/src/mage/sets/magic2013/AkromasMemorial.java @@ -64,8 +64,8 @@ public class AkromasMemorial extends CardImpl { @Override public void build() { // Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red. - CompoundAbility abilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), new ProtectionAbility(filterBlack), new ProtectionAbility(filterRed)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(abilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures you control")))); + CompoundAbility compoundAbilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), new ProtectionAbility(filterBlack), new ProtectionAbility(filterRed)); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); } public AkromasMemorial(final AkromasMemorial card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java b/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java index b8787b58a07..d0fc1552303 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java +++ b/Mage.Sets/src/mage/sets/magic2013/CleaverRiot.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; -import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterCreaturePermanent; /** * @@ -49,7 +49,7 @@ public class CleaverRiot extends CardImpl { this.color.setRed(true); // Creatures you control gain double strike until end of turn. - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), false)); } public CleaverRiot(final CleaverRiot card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java b/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java index 8844ddcf5f0..d7eb63995d1 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/SteelformSliver.java @@ -56,7 +56,7 @@ public class SteelformSliver extends CardImpl { // Sliver creatures you control get +0/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, - new FilterCreaturePermanent("Sliver", "Sliver creatures you control"), false))); + new FilterCreaturePermanent("Sliver", "Sliver creatures"), false))); } public SteelformSliver(final SteelformSliver card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java index e50aa98b84b..7f583eff13f 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java @@ -38,7 +38,8 @@ import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.constants.Duration; import mage.constants.Zone; -import mage.filter.common.FilterControlledPermanent; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; /** @@ -46,11 +47,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class LeoninAbunas extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledPermanent("Artifacts you control"); - - static { - filter.add(new CardTypePredicate(CardType.ARTIFACT)); - } + private static final FilterPermanent filter = new FilterArtifactPermanent(); public LeoninAbunas(UUID ownerId) { super(ownerId, 8, "Leonin Abunas", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}"); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java index 16cd9acab08..24fdca0a157 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java @@ -33,10 +33,10 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.cards.CardImpl; -import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -50,8 +50,6 @@ import mage.target.common.TargetCreaturePermanent; */ public class ArmWithAEther extends CardImpl { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control"); - public ArmWithAEther(UUID ownerId) { super(ownerId, 28, "Arm with AEther", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "NPH"; @@ -59,7 +57,9 @@ public class ArmWithAEther extends CardImpl { this.color.setBlue(true); // Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(new ArmWithAEtherTriggeredAbility(), Duration.EndOfTurn, filter)); + Effect effect = new GainAbilityControlledEffect(new ArmWithAEtherTriggeredAbility(), Duration.EndOfTurn, new FilterCreaturePermanent()); + effect.setText("Until end of turn, creatures you control gain \"Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand.\""); + this.getSpellAbility().addEffect(effect); } public ArmWithAEther(final ArmWithAEther card) { diff --git a/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java b/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java index e4e6294015f..3198b0edbf6 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/sets/planechase2012/VelaTheNightClad.java @@ -74,7 +74,7 @@ public class VelaTheNightClad extends CardImpl { this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, new GainAbilityControlledEffect(IntimidateAbility.getInstance(), - Duration.WhileOnBattlefield, new FilterCreaturePermanent("Other creatures you control"), true ))); + Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true ))); // Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life. Ability ability = new ZoneChangeAllTriggeredAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/ravnika/TolsimirWolfblood.java b/Mage.Sets/src/mage/sets/ravnika/TolsimirWolfblood.java index 41e64474416..a92752c1b7c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/sets/ravnika/TolsimirWolfblood.java @@ -52,8 +52,8 @@ import mage.game.permanent.token.Token; */ public class TolsimirWolfblood extends CardImpl { - private static final FilterCreaturePermanent filterGreen = new FilterCreaturePermanent("Other green creatures you control"); - private static final FilterCreaturePermanent filterWhite = new FilterCreaturePermanent("Other white creatures you control"); + private static final FilterCreaturePermanent filterGreen = new FilterCreaturePermanent("green creatures you control"); + private static final FilterCreaturePermanent filterWhite = new FilterCreaturePermanent("white creatures you control"); static { filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); filterGreen.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java index 96d066a9a64..b09c6cbf3f7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Broodwarden.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class Broodwarden extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Eldrazi Spawn creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Eldrazi Spawn creatures"); static { filter.add(new SubtypePredicate("Eldrazi")); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java index f43070fe32a..19dfe454d18 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java @@ -45,7 +45,7 @@ import mage.target.common.TargetControlledPermanent; */ public class Deprive extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("land"); public Deprive(UUID ownerId) { super(ownerId, 59, "Deprive", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java index 731042398ec..4824a20aa01 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java @@ -57,7 +57,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class JoragaTreespeaker extends LevelerCard { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elves you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elves"); static { filter.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java index adac8155b93..78cc6816e24 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoonbowIllusionist.java @@ -64,7 +64,7 @@ public class MoonbowIllusionist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Target land becomes the basic land type of your choice until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new GenericManaCost(2)); - ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent()))); + ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("land")))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java index e5d0d5399f0..0b8462d3c76 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java @@ -50,7 +50,7 @@ import mage.target.common.TargetLandPermanent; */ public class OboroBreezecaller extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("land"); public OboroBreezecaller(UUID ownerId) { super(ownerId, 48, "Oboro Breezecaller", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java index 8a9bc14afbc..8a1d11a1f67 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; public class DeathBaron extends CardImpl { private static final FilterCreaturePermanent filterSkeletons = new FilterCreaturePermanent("Skeleton creatures"); - private static final FilterCreaturePermanent filterZombie = new FilterCreaturePermanent("other Zombie creatures"); + private static final FilterCreaturePermanent filterZombie = new FilterCreaturePermanent("Zombie creatures"); static { filterSkeletons.add(new SubtypePredicate("Skeleton")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java index 8ddeedae497..2da1c46b7d6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java @@ -1,4 +1,4 @@ -/* + /* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are @@ -48,7 +48,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; public class MasterOfEtherium extends CardImpl { private static final FilterControlledPermanent filterCounted = new FilterControlledPermanent("artifacts you control"); - private static final FilterCreaturePermanent filterBoosted = new FilterCreaturePermanent("artifact creatures you control"); + private static final FilterCreaturePermanent filterBoosted = new FilterCreaturePermanent("artifact creatures"); static { filterCounted.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java b/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java index a7c7a98d261..28f3e2facd7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TortoiseFormation.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterCreaturePermanent; /** * @@ -42,8 +43,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; */ public class TortoiseFormation extends CardImpl { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control"); - public TortoiseFormation(UUID ownerId) { super(ownerId, 61, "Tortoise Formation", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "ALA"; @@ -51,7 +50,7 @@ public class TortoiseFormation extends CardImpl { this.color.setBlue(true); // Creatures you control gain shroud until end of turn. - this.getSpellAbility().addEffect(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, filter)); + this.getSpellAbility().addEffect(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent())); } public TortoiseFormation(final TortoiseFormation card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java index be11b0246ce..5fe6603f6b7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java @@ -53,7 +53,7 @@ public class JoragaWarcaller extends CardImpl { private static final String rule = "Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller"; - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other elf creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("elf creatures you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); @@ -81,7 +81,8 @@ public class JoragaWarcaller extends CardImpl { // Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new CountersCount(CounterType.P1P1), new CountersCount(CounterType.P1P1), Duration.WhileOnBattlefield, filter, true, rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + new BoostAllEffect( new CountersCount(CounterType.P1P1), new CountersCount(CounterType.P1P1), Duration.WhileOnBattlefield, filter, true, rule))); } diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java index 2016b234d48..a86bb7afc55 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostAllEffect.java @@ -73,7 +73,7 @@ public class BoostAllEffect extends ContinuousEffectImpl { } public BoostAllEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource, String rule) { - this(power, toughness, duration, filter, excludeSource, null, false); + this(power, toughness, duration, filter, excludeSource, rule, false); } public BoostAllEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource, String rule, boolean lockedInPT) {