From 80ed40f6e8acb44809d104b455f452bb287ce703 Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Tue, 27 Oct 2015 20:36:07 -0700 Subject: [PATCH 1/8] use correct mana symbol order matching the printed cards --- Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java | 2 +- Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java | 2 +- Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java | 2 +- .../src/mage/sets/prereleaseevents/QuestingPhelddagrif.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java index 608418d782..afe5461a9f 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java +++ b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java @@ -46,7 +46,7 @@ import mage.constants.Rarity; public class KnotvineMystic extends CardImpl{ public KnotvineMystic(UUID ownerId) { - super(ownerId, 114, "Knotvine Mystic", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{R}{G}"); + super(ownerId, 114, "Knotvine Mystic", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{G}{W}"); this.expansionSetCode = "CON"; diff --git a/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java b/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java index 5312827639..087c376526 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UrbanEvolution.java @@ -44,7 +44,7 @@ import mage.constants.Duration; public class UrbanEvolution extends CardImpl { public UrbanEvolution(UUID ownerId) { - super(ownerId, 204, "Urban Evolution", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{U}{G}"); + super(ownerId, 204, "Urban Evolution", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{U}"); this.expansionSetCode = "GTC"; //Draw three cards. diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java b/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java index 34d4495c71..c0424b1594 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/Duneblast.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; public class Duneblast extends CardImpl { public Duneblast(UUID ownerId) { - super(ownerId, 174, "Duneblast", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{G}{B}"); + super(ownerId, 174, "Duneblast", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{W}{B}{G}"); this.expansionSetCode = "KTK"; diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java index ab1050c0e4..b0cf690da7 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SultaiAscendancy.java @@ -46,7 +46,7 @@ import mage.filter.FilterCard; public class SultaiAscendancy extends CardImpl { public SultaiAscendancy(UUID ownerId) { - super(ownerId, 203, "Sultai Ascendancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}{B}{U}"); + super(ownerId, 203, "Sultai Ascendancy", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{G}{U}"); this.expansionSetCode = "KTK"; diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/QuestingPhelddagrif.java b/Mage.Sets/src/mage/sets/prereleaseevents/QuestingPhelddagrif.java index 1aee4f8fb0..30f15d65b7 100644 --- a/Mage.Sets/src/mage/sets/prereleaseevents/QuestingPhelddagrif.java +++ b/Mage.Sets/src/mage/sets/prereleaseevents/QuestingPhelddagrif.java @@ -65,7 +65,7 @@ public class QuestingPhelddagrif extends CardImpl { } public QuestingPhelddagrif(UUID ownerId) { - super(ownerId, 13, "Questing Phelddagrif", Rarity.SPECIAL, new CardType[]{CardType.CREATURE}, "{1}{W}{U}{G}"); + super(ownerId, 13, "Questing Phelddagrif", Rarity.SPECIAL, new CardType[]{CardType.CREATURE}, "{1}{G}{W}{U}"); this.expansionSetCode = "PTC"; this.subtype.add("Phelddagrif"); this.power = new MageInt(4); From 3c24b9fe4740b94d77dd72c30afa147fc91dfbbb Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Wed, 28 Oct 2015 21:42:05 -0700 Subject: [PATCH 2/8] fix Gempalm Polluter card name --- Mage.Sets/src/mage/sets/legions/GempalmPolluter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/legions/GempalmPolluter.java b/Mage.Sets/src/mage/sets/legions/GempalmPolluter.java index 1bf3c4306e..65f53df451 100644 --- a/Mage.Sets/src/mage/sets/legions/GempalmPolluter.java +++ b/Mage.Sets/src/mage/sets/legions/GempalmPolluter.java @@ -56,7 +56,7 @@ public class GempalmPolluter extends CardImpl { } public GempalmPolluter(UUID ownerId) { - super(ownerId, 70, "Gempalm Avenger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{B}"); + super(ownerId, 70, "Gempalm Polluter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{B}"); this.expansionSetCode = "LGN"; this.subtype.add("Zombie"); this.power = new MageInt(4); From 35052f806dfc07f5e307ea913b8c8a76c60582a8 Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Wed, 28 Oct 2015 21:47:14 -0700 Subject: [PATCH 3/8] fix Skeletonize token type ... but the card is currently broken and doesn't create the token --- Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java index f9000f459e..18cf0faca3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java @@ -152,7 +152,7 @@ class SkeletonToken extends Token { super("Skeleton", "1/1 black Skeleton creature token with \"{B}: Regenerate this creature.\""); this.cardType.add(CardType.CREATURE); this.color = ObjectColor.BLACK; - this.subtype.add("Bat"); + this.subtype.add("Skeleton"); this.power = new MageInt(1); this.toughness = new MageInt(1); From 81de9eb5c85c2854ea79e6f6ac5fe1d82f4a2d1a Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Tue, 27 Oct 2015 22:25:24 -0700 Subject: [PATCH 4/8] DealtDamageToCreatureBySourceDies replaces per-card effect --- .../sets/avacynrestored/PillarOfFlame.java | 48 ------------------- .../championsofkamigawa/YamabushisStorm.java | 42 ---------------- 2 files changed, 90 deletions(-) diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java index 014284bd8e..ed8b8b3b02 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PillarOfFlame.java @@ -74,51 +74,3 @@ public class PillarOfFlame extends CardImpl { return new PillarOfFlame(this); } } - -class PillarOfFlameEffect extends ReplacementEffectImpl { - - public PillarOfFlameEffect() { - super(Duration.EndOfTurn, Outcome.Exile); - staticText = "If a creature dealt damage this way would die this turn, exile it instead"; - } - - public PillarOfFlameEffect(final PillarOfFlameEffect effect) { - super(effect); - } - - @Override - public PillarOfFlameEffect copy() { - return new PillarOfFlameEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - return true; - } - - @Override - public boolean replaceEvent(GameEvent event, Ability source, Game game) { - Player controller = game.getPlayer(source.getControllerId()); - Permanent permanent = ((ZoneChangeEvent) event).getTarget(); - if (controller != null && permanent != null) { - return controller.moveCards(permanent, Zone.BATTLEFIELD, Zone.EXILED, source, game); - } - return false; - } - - @Override - public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == EventType.ZONE_CHANGE; - } - - @Override - public boolean applies(GameEvent event, Ability source, Game game) { - if (((ZoneChangeEvent) event).isDiesEvent()) { - DamagedByWatcher watcher = (DamagedByWatcher) game.getState().getWatchers().get("DamagedByWatcher", source.getSourceId()); - if (watcher != null) { - return watcher.wasDamaged(event.getTargetId(), game); - } - } - return false; - } -} diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java index 9ec4a27bcc..ad1ceef375 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisStorm.java @@ -77,45 +77,3 @@ public class YamabushisStorm extends CardImpl { } } - -class YamabushisStormEffect extends ReplacementEffectImpl { - - public YamabushisStormEffect() { - super(Duration.EndOfTurn, Outcome.Exile); - staticText = "If a creature dealt damage this way would die this turn, exile it instead"; - } - - public YamabushisStormEffect(final YamabushisStormEffect effect) { - super(effect); - } - - @Override - public YamabushisStormEffect copy() { - return new YamabushisStormEffect(this); - } - - @Override - public boolean replaceEvent(GameEvent event, Ability source, Game game) { - Player controller = game.getPlayer(source.getControllerId()); - Permanent permanent = ((ZoneChangeEvent) event).getTarget(); - if (controller != null && permanent != null) { - return controller.moveCardToExileWithInfo(permanent, null, "", source.getSourceId(), game, Zone.BATTLEFIELD, true); - } - return false; - } - - @Override - public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == EventType.ZONE_CHANGE; - } - - @Override - public boolean applies(GameEvent event, Ability source, Game game) { - if (((ZoneChangeEvent) event).isDiesEvent()) { - DamagedByWatcher watcher = (DamagedByWatcher) game.getState().getWatchers().get("DamagedByWatcher", source.getSourceId()); - return watcher != null && watcher.wasDamaged(event.getTargetId(), game); - } - return false; - } - -} From ff1b424cafeae523ebd004ab30e3333b8afc50bb Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Tue, 27 Oct 2015 21:02:32 -0700 Subject: [PATCH 5/8] options passed to JOptionPane were backwards they're both -1, so this doesn't change anything --- .../java/org/mage/plugins/card/images/DownloadPictures.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java index 4467e0ab2a..2423f21520 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java @@ -49,8 +49,6 @@ import mage.client.constants.Constants; import mage.client.dialog.PreferencesDialog; import mage.client.util.sets.ConstructedFormats; import mage.remote.Connection; -import static mage.remote.Connection.ProxyType.HTTP; -import static mage.remote.Connection.ProxyType.SOCKS; import net.java.truevfs.access.TFile; import net.java.truevfs.access.TFileOutputStream; import net.java.truevfs.access.TVFS; @@ -221,7 +219,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab // JOptionPane Object[] options = { startDownloadButton, closeButton = new JButton("Cancel") }; - dlg = new JOptionPane(p0, JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[1]); + dlg = new JOptionPane(p0, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[1]); } public static boolean checkForNewCards(List allCards) { From b23bd0cf1ffa02e3bc349d96015d1272d56f9b42 Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Wed, 28 Oct 2015 22:51:24 -0700 Subject: [PATCH 6/8] some Fallen Empires cards had the wrong package --- Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java | 2 +- Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java | 2 +- Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java index 8564935729..bd805f28bf 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java +++ b/Mage.Sets/src/mage/sets/fallenempires/IcatianJavelineers3.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.timeshifted; +package mage.sets.fallenempires; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java index 09706ba97b..b691888fe0 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java +++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil2.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.masterseditionii; +package mage.sets.fallenempires; import java.util.UUID; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java b/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java index 7289331f5f..0acc86c530 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java +++ b/Mage.Sets/src/mage/sets/fallenempires/NightSoil3.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.masterseditionii; +package mage.sets.fallenempires; import java.util.UUID; import mage.constants.Rarity; From 995063039da37d20f0cb8b6f91af51e03a71e63f Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Wed, 28 Oct 2015 23:25:17 -0700 Subject: [PATCH 7/8] fix wrong-typed tokens and abilities --- .../sets/betrayersofkamigawa/KitsunePalliator.java | 8 -------- .../src/mage/sets/commander2013/LeafdrakeRoost.java | 10 +++++----- .../mage/sets/morningtide/BrighthearthBanneret.java | 2 +- Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java | 2 +- Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java | 2 +- Mage.Sets/src/mage/sets/timespiral/OpalGuardian.java | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java index 4940e8ce24..9af055fbbd 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KitsunePalliator.java @@ -39,8 +39,6 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -52,12 +50,6 @@ import mage.target.targetpointer.FixedTarget; */ public class KitsunePalliator extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai you control"); - static { - filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate("Samurai")); - } - public KitsunePalliator(UUID ownerId) { super(ownerId, 14, "Kitsune Palliator", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "BOK"; diff --git a/Mage.Sets/src/mage/sets/commander2013/LeafdrakeRoost.java b/Mage.Sets/src/mage/sets/commander2013/LeafdrakeRoost.java index 97101a89d0..b8ee63186e 100644 --- a/Mage.Sets/src/mage/sets/commander2013/LeafdrakeRoost.java +++ b/Mage.Sets/src/mage/sets/commander2013/LeafdrakeRoost.java @@ -70,7 +70,7 @@ public class LeafdrakeRoost extends CardImpl { this.addAbility(ability); // Enchanted land has "{G}{U}, {tap}: Put a 2/2 green and blue Drake creature token with flying onto the battlefield." - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LeafdrakeRoostDragonToken()), new ManaCostsImpl("{G}{U}")); + Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LeafdrakeRoostDrakeToken()), new ManaCostsImpl("{G}{U}")); abilityToGain.addCost(new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{G}{U}, {t}: Put a 2/2 green and blue Drake creature token with flying onto the battlefield.\""))); @@ -87,14 +87,14 @@ public class LeafdrakeRoost extends CardImpl { } } -class LeafdrakeRoostDragonToken extends Token { +class LeafdrakeRoostDrakeToken extends Token { - public LeafdrakeRoostDragonToken() { - super("Dragon", "2/2 green and blue Drake creature token with flying"); + public LeafdrakeRoostDrakeToken() { + super("Drake", "2/2 green and blue Drake creature token with flying"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setBlue(true); - subtype.add("Dragon"); + subtype.add("Drake"); power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java b/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java index e404891c77..521d13e03f 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/sets/morningtide/BrighthearthBanneret.java @@ -52,7 +52,7 @@ public class BrighthearthBanneret extends CardImpl { static { filter.add(Predicates.or( new SubtypePredicate("Elemental"), - new SubtypePredicate("Shaman"))); + new SubtypePredicate("Warrior"))); } public BrighthearthBanneret(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java b/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java index 2430cec8be..1e2a615e11 100644 --- a/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java +++ b/Mage.Sets/src/mage/sets/prophecy/LivingTerrain.java @@ -80,7 +80,7 @@ class TreefolkToken extends Token { super("Treefolk", "5/6 green Treefolk creature"); cardType.add(CardType.CREATURE); this.color.setGreen(true); - subtype.add("Spirit"); + subtype.add("Treefolk"); power = new MageInt(5); toughness = new MageInt(6); } diff --git a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java index c086c8bf41..b94762aca6 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java +++ b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java @@ -93,7 +93,7 @@ class GriffinToken extends Token { cardType.add(CardType.CREATURE); color.setWhite(true); - subtype.add("Soldier"); + subtype.add("Griffin"); power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/timespiral/OpalGuardian.java b/Mage.Sets/src/mage/sets/timespiral/OpalGuardian.java index 04e6861f17..56c436d813 100644 --- a/Mage.Sets/src/mage/sets/timespiral/OpalGuardian.java +++ b/Mage.Sets/src/mage/sets/timespiral/OpalGuardian.java @@ -86,7 +86,7 @@ class OpalGuardianGargoyle extends Token { public OpalGuardianGargoyle() { super("Gargoyle", "a 3/4 Gargoyle creature with flying and protection from red"); cardType.add(CardType.CREATURE); - subtype.add("Knight"); + subtype.add("Gargoyle"); power = new MageInt(3); toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); From 5c5e64fcce12c114f4aaa0a4a4e7afff6adc6ca8 Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Thu, 29 Oct 2015 00:18:51 -0700 Subject: [PATCH 8/8] Krovikan Fetish is a slow cantrip --- Mage.Sets/src/mage/sets/fifthedition/KrovikanFetish.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/fifthedition/KrovikanFetish.java b/Mage.Sets/src/mage/sets/fifthedition/KrovikanFetish.java index b0737e4e54..ecf2cda9de 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/KrovikanFetish.java +++ b/Mage.Sets/src/mage/sets/fifthedition/KrovikanFetish.java @@ -31,7 +31,9 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; @@ -63,7 +65,8 @@ public class KrovikanFetish extends CardImpl { this.addAbility(ability); // When Krovikan Fetish enters the battlefield, draw a card at the beginning of the next turn's upkeep. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( + new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1), Duration.OneUse)), false)); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)));