diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java b/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java index 8be3ac4571..37c7fca82c 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java @@ -30,21 +30,14 @@ package mage.sets.urzaslegacy; import java.util.UUID; import mage.constants.*; -import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; -import mage.cards.repository.CardRepository; -import mage.choices.Choice; -import mage.choices.ChoiceImpl; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.players.Player; -import mage.util.CardUtil; /** * diff --git a/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java b/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java index 96dd4b72b4..c75cda64f5 100644 --- a/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java +++ b/Mage.Sets/src/mage/sets/venservskoth/GalepowderMage.java @@ -42,9 +42,12 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Rarity; import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import mage.target.common.TargetCreaturePermanent; /** * @@ -52,6 +55,12 @@ import mage.players.Player; */ public class GalepowderMage extends CardImpl { + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); + + static { + filter.add(new AnotherPredicate()); + } + public GalepowderMage(UUID ownerId) { super(ownerId, 12, "Galepowder Mage", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "DDI"; @@ -65,7 +74,9 @@ public class GalepowderMage extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever Galepowder Mage attacks, exile another target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. - this.addAbility(new AttacksTriggeredAbility(new GalepowderMageEffect(), false)); + Ability ability = new AttacksTriggeredAbility(new GalepowderMageEffect(), false); + ability.addTarget(new TargetCreaturePermanent(filter)); + this.addAbility(ability); } public GalepowderMage(final GalepowderMage card) { diff --git a/Mage/src/mage/game/tournament/TournamentImpl.java b/Mage/src/mage/game/tournament/TournamentImpl.java index e92f50ee41..9650bfe57d 100644 --- a/Mage/src/mage/game/tournament/TournamentImpl.java +++ b/Mage/src/mage/game/tournament/TournamentImpl.java @@ -392,17 +392,11 @@ public abstract class TournamentImpl implements Tournament { if (options.getLimitedOptions().getDraftCube() != null) { DraftCube cube = options.getLimitedOptions().getDraftCube(); for (int i = 0; i < options.getLimitedOptions().getNumberBoosters(); i++) { - List booster = cube.createBooster(); - for (Card card: booster) { - player.getDeck().getSideboard().add(card); - } + player.getDeck().getSideboard().addAll(cube.createBooster()); } } else { for (ExpansionSet set: sets) { - List booster = set.createBooster(); - for (Card card: booster) { - player.getDeck().getSideboard().add(card); - } + player.getDeck().getSideboard().addAll(set.createBooster()); } } }