From e7205391baeaaa1b05bb5353370fd8def1013041 Mon Sep 17 00:00:00 2001
From: Jeff Wadsworth <jeff@delmarus.com>
Date: Mon, 20 Jun 2022 11:53:02 -0500
Subject: [PATCH] - Fixed #9128
---
.../src/mage/cards/a/AncientBrassDragon.java | 16 ++++++++--------
.../target/common/TargetCardInGraveyard.java | 11 ++++++++---
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Mage.Sets/src/mage/cards/a/AncientBrassDragon.java b/Mage.Sets/src/mage/cards/a/AncientBrassDragon.java
index 071c07600a..77389b2e3a 100644
--- a/Mage.Sets/src/mage/cards/a/AncientBrassDragon.java
+++ b/Mage.Sets/src/mage/cards/a/AncientBrassDragon.java
@@ -19,9 +19,9 @@ import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.mageobject.ManaValuePredicate;
import mage.game.Game;
import mage.players.Player;
-import mage.target.common.TargetCardInYourGraveyard;
import java.util.UUID;
+import mage.target.common.TargetCardInGraveyard;
/**
* @author TheElk801
@@ -57,8 +57,8 @@ class AncientBrassDragonEffect extends OneShotEffect {
AncientBrassDragonEffect() {
super(Outcome.Benefit);
- staticText = "roll a d20. When you do, put any number of target creature cards with total mana value X " +
- "or less from graveyards onto the battlefield under your control, where X is the result";
+ staticText = "roll a d20. When you do, put any number of target creature cards with total mana value X "
+ + "or less from graveyards onto the battlefield under your control, where X is the result";
}
private AncientBrassDragonEffect(final AncientBrassDragonEffect effect) {
@@ -86,7 +86,7 @@ class AncientBrassDragonEffect extends OneShotEffect {
}
}
-class AncientBrassDragonTarget extends TargetCardInYourGraveyard {
+class AncientBrassDragonTarget extends TargetCardInGraveyard {
private final int xValue;
@@ -111,8 +111,8 @@ class AncientBrassDragonTarget extends TargetCardInYourGraveyard {
return false;
}
Card card = game.getCard(id);
- return card != null &&
- this.getTargets()
+ return card != null
+ && this.getTargets()
.stream()
.map(game::getCard)
.mapToInt(Card::getManaValue)
@@ -121,8 +121,8 @@ class AncientBrassDragonTarget extends TargetCardInYourGraveyard {
private static final FilterCard makeFilter(int xValue) {
FilterCard filter = new FilterCreatureCard(
- "creature cards with total mana value " +
- xValue + " or less from your graveyard"
+ "creature cards with total mana value "
+ + xValue + " or less from graveyards"
);
filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue));
return filter;
diff --git a/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java
index 4f7cffdac2..77f5774c5a 100644
--- a/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java
+++ b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java
@@ -25,15 +25,20 @@ public class TargetCardInGraveyard extends TargetCard {
}
public TargetCardInGraveyard(int numTargets, FilterCard filter) {
- this(numTargets, numTargets, filter);
+ this(numTargets, numTargets, filter, false);
}
public TargetCardInGraveyard(int minNumTargets, int maxNumTargets) {
- this(minNumTargets, maxNumTargets, defaultFilter);
+ this(minNumTargets, maxNumTargets, defaultFilter, false);
+ }
+
+ public TargetCardInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) {
+ this(minNumTargets, maxNumTargets, filter, false);
}
- public TargetCardInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) {
+ public TargetCardInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter, boolean notTarget) {
super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter);
+ this.setNotTarget(notTarget);
}
public TargetCardInGraveyard(final TargetCardInGraveyard target) {