From ae329fd81f03900e7ac8393e55fa9aaf4dae5e05 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Wed, 13 Dec 2017 00:19:22 -0200 Subject: [PATCH 1/3] Add a line to remove from grave to avoid duplicates --- Mage.Sets/src/mage/cards/a/AccursedWitch.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index 24a59bfc1e..f51fbf09ea 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -37,11 +37,15 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.TransformAbility; +import mage.cards.i.InfectiousCurse; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.i.InfectiousCurse; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.CostModificationType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -56,8 +60,8 @@ public class AccursedWitch extends CardImpl { public AccursedWitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.SHAMAN); + this.subtype.add("Human"); + this.subtype.add("Shaman"); this.power = new MageInt(4); this.toughness = new MageInt(2); @@ -106,6 +110,7 @@ class AccursedWitchReturnTransformedEffect extends OneShotEffect { //note: should check for null after game.getCard Card card = game.getCard(source.getSourceId()); if (card != null) { + card.removeFromZone(game, Zone.GRAVEYARD, source.getSourceId()); card.putOntoBattlefield(game, Zone.BATTLEFIELD, source.getSourceId(), source.getControllerId(), false); } } From 2103bfb74a569dc1bd9cc6458581d2710484de71 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Wed, 13 Dec 2017 00:28:00 -0200 Subject: [PATCH 2/3] Fix merge old stuff --- Mage.Sets/src/mage/cards/a/AccursedWitch.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index f51fbf09ea..459d622ef5 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -41,11 +41,7 @@ import mage.cards.i.InfectiousCurse; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.CostModificationType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -60,8 +56,8 @@ public class AccursedWitch extends CardImpl { public AccursedWitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Human"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.SHAMAN); + this.subtype.add(SubType.HUMAN); this.power = new MageInt(4); this.toughness = new MageInt(2); From 558739d055571a024dda34adb5d0ebfd938b8e88 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Wed, 13 Dec 2017 00:29:16 -0200 Subject: [PATCH 3/3] Fix merge old stuff again --- Mage.Sets/src/mage/cards/a/AccursedWitch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index 459d622ef5..f3fcf89481 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -56,8 +56,8 @@ public class AccursedWitch extends CardImpl { public AccursedWitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add(SubType.SHAMAN); this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(4); this.toughness = new MageInt(2);