Merge pull request #5696 from ketsuban/choose-not-target

Fix cards which incorrectly target rather than choose
This commit is contained in:
Oleg Agafonov 2019-04-08 18:28:55 +02:00 committed by GitHub
commit 9770175c11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -88,6 +88,7 @@ class DawnbreakReclaimerEffect extends OneShotEffect {
MageObject sourceObject = source.getSourceObject(game); MageObject sourceObject = source.getSourceObject(game);
if (controller != null && sourceObject != null) { if (controller != null && sourceObject != null) {
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"));
targetOpponentGraveyard.setNotTarget(true);
Player opponent = null; Player opponent = null;
Card cardOpponentGraveyard = null; Card cardOpponentGraveyard = null;
targetOpponentGraveyard.setNotTarget(true); targetOpponentGraveyard.setNotTarget(true);
@ -102,6 +103,7 @@ class DawnbreakReclaimerEffect extends OneShotEffect {
if (opponent == null) { if (opponent == null) {
// if no card from opponent was available controller has to chose an opponent to select a creature card in controllers graveyard // if no card from opponent was available controller has to chose an opponent to select a creature card in controllers graveyard
TargetOpponent targetOpponent = new TargetOpponent(true); TargetOpponent targetOpponent = new TargetOpponent(true);
targetOpponent.setNotTarget(true);
controller.choose(outcome, targetOpponent, source.getSourceId(), game); controller.choose(outcome, targetOpponent, source.getSourceId(), game);
opponent = game.getPlayer(targetOpponent.getFirstTarget()); opponent = game.getPlayer(targetOpponent.getFirstTarget());
if (opponent != null) { if (opponent != null) {