- Fix related to #5686

This commit is contained in:
Jeff 2019-04-08 10:48:08 -05:00
parent bd6bb7b796
commit 8cd4497c2e
2 changed files with 18 additions and 16 deletions

View file

@ -1,4 +1,3 @@
package mage.cards.d; package mage.cards.d;
import java.util.HashSet; import java.util.HashSet;
@ -33,7 +32,7 @@ import mage.target.common.TargetOpponent;
public final class DawnbreakReclaimer extends CardImpl { public final class DawnbreakReclaimer extends CardImpl {
public DawnbreakReclaimer(UUID ownerId, CardSetInfo setInfo) { public DawnbreakReclaimer(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{W}");
this.subtype.add(SubType.ANGEL); this.subtype.add(SubType.ANGEL);
this.power = new MageInt(5); this.power = new MageInt(5);
this.toughness = new MageInt(5); this.toughness = new MageInt(5);
@ -74,11 +73,10 @@ class DawnbreakReclaimerEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
/** /**
* 04.11.2015 If any opponent has a creature card in their * 04.11.2015 If any opponent has a creature card in their graveyard as
* graveyard as Dawnbreak Reclaimer's ability resolves, then you must * Dawnbreak Reclaimer's ability resolves, then you must choose one of
* choose one of those cards. You can't choose a different opponent with * those cards. You can't choose a different opponent with no creature
* no creature cards in their graveyard to avoid returning one of * cards in their graveyard to avoid returning one of those cards.
* those cards.
* *
* 04.11.2015 If there are no creature cards in any opponent's graveyard * 04.11.2015 If there are no creature cards in any opponent's graveyard
* as Dawnbreak Reclaimer's ability resolves, you'll still have the * as Dawnbreak Reclaimer's ability resolves, you'll still have the
@ -92,6 +90,7 @@ class DawnbreakReclaimerEffect extends OneShotEffect {
TargetCardInOpponentsGraveyard targetOpponentGraveyard = new TargetCardInOpponentsGraveyard(new FilterCreatureCard("a creature card in an opponent's graveyard")); TargetCardInOpponentsGraveyard targetOpponentGraveyard = new TargetCardInOpponentsGraveyard(new FilterCreatureCard("a creature card in an opponent's graveyard"));
Player opponent = null; Player opponent = null;
Card cardOpponentGraveyard = null; Card cardOpponentGraveyard = null;
targetOpponentGraveyard.setNotTarget(true);
if (targetOpponentGraveyard.canChoose(source.getSourceId(), source.getControllerId(), game)) { if (targetOpponentGraveyard.canChoose(source.getSourceId(), source.getControllerId(), game)) {
controller.choose(Outcome.Detriment, targetOpponentGraveyard, source.getSourceId(), game); controller.choose(Outcome.Detriment, targetOpponentGraveyard, source.getSourceId(), game);
cardOpponentGraveyard = game.getCard(targetOpponentGraveyard.getFirstTarget()); cardOpponentGraveyard = game.getCard(targetOpponentGraveyard.getFirstTarget());

View file

@ -84,6 +84,7 @@ class GruesomeMenagerieEffect extends OneShotEffect {
Cards cards = new CardsImpl(); Cards cards = new CardsImpl();
Target target; Target target;
target = new TargetCardInYourGraveyard(filter1); target = new TargetCardInYourGraveyard(filter1);
target.setNotTarget(true);
if (player.choose(outcome, target, source.getSourceId(), game)) { if (player.choose(outcome, target, source.getSourceId(), game)) {
Card card = game.getCard(target.getFirstTarget()); Card card = game.getCard(target.getFirstTarget());
if (card != null) { if (card != null) {
@ -91,6 +92,7 @@ class GruesomeMenagerieEffect extends OneShotEffect {
} }
} }
target = new TargetCardInYourGraveyard(filter2); target = new TargetCardInYourGraveyard(filter2);
target.setNotTarget(true);
if (player.choose(outcome, target, source.getSourceId(), game)) { if (player.choose(outcome, target, source.getSourceId(), game)) {
Card card = game.getCard(target.getFirstTarget()); Card card = game.getCard(target.getFirstTarget());
if (card != null) { if (card != null) {
@ -98,6 +100,7 @@ class GruesomeMenagerieEffect extends OneShotEffect {
} }
} }
target = new TargetCardInYourGraveyard(filter3); target = new TargetCardInYourGraveyard(filter3);
target.setNotTarget(true);
if (player.choose(outcome, target, source.getSourceId(), game)) { if (player.choose(outcome, target, source.getSourceId(), game)) {
Card card = game.getCard(target.getFirstTarget()); Card card = game.getCard(target.getFirstTarget());
if (card != null) { if (card != null) {