From 50acfad59cd5ab7ef1391c4e8d5ecfd8c2739651 Mon Sep 17 00:00:00 2001 From: xenohedron <12538125+xenohedron@users.noreply.github.com> Date: Sun, 8 Jun 2025 00:57:07 -0400 Subject: [PATCH] remove unnecessary method that missed source param --- Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java | 2 +- Mage.Sets/src/mage/cards/m/MirrorOfFate.java | 2 +- Mage.Sets/src/mage/cards/m/MuseVessel.java | 2 +- Mage.Sets/src/mage/cards/n/NissasEncouragement.java | 2 +- .../dynamicvalue/common/ManaValueInGraveyard.java | 2 +- Mage/src/main/java/mage/cards/CardsImpl.java | 2 +- Mage/src/main/java/mage/filter/FilterCard.java | 10 ---------- Mage/src/main/java/mage/target/TargetCard.java | 2 +- .../java/mage/target/common/TargetCardInExile.java | 2 +- .../main/java/mage/target/common/TargetDiscard.java | 2 +- 10 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java index fb1032599f5..acdb4da7e3f 100644 --- a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java @@ -103,7 +103,7 @@ class LlawanCephalidRuleModifyingEffect extends ContinuousRuleModifyingEffectImp Player controller = game.getPlayer(source.getControllerId()); if (controller != null && game.isOpponent(controller, event.getPlayerId())) { Card card = game.getCard(event.getSourceId()); - if (card != null && filter.match(card, source.getControllerId(), game)) { + if (card != null && filter.match(card, source.getControllerId(), source, game)) { return true; } } diff --git a/Mage.Sets/src/mage/cards/m/MirrorOfFate.java b/Mage.Sets/src/mage/cards/m/MirrorOfFate.java index 93b35e1a10f..728f9cff566 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorOfFate.java +++ b/Mage.Sets/src/mage/cards/m/MirrorOfFate.java @@ -116,7 +116,7 @@ class MirrorOfFateTarget extends TargetCardInExile { && game.getState().getZone(card.getId()) == Zone.EXILED) { for (ExileZone exile : game.getExile().getExileZones()) { if (exile != null && exile.contains(id)) { - return filter.match(card, source.getControllerId(), game); + return filter.match(card, source.getControllerId(), source, game); } } } diff --git a/Mage.Sets/src/mage/cards/m/MuseVessel.java b/Mage.Sets/src/mage/cards/m/MuseVessel.java index 5107bc656c9..299180f731f 100644 --- a/Mage.Sets/src/mage/cards/m/MuseVessel.java +++ b/Mage.Sets/src/mage/cards/m/MuseVessel.java @@ -172,7 +172,7 @@ class TargetCardInMuseVesselExile extends TargetCardInExile { exile = game.getExile().getExileZone(exileId); } if (exile != null && exile.contains(id)) { - return filter.match(card, source.getControllerId(), game); + return filter.match(card, source.getControllerId(), source, game); } } return false; diff --git a/Mage.Sets/src/mage/cards/n/NissasEncouragement.java b/Mage.Sets/src/mage/cards/n/NissasEncouragement.java index 62083b226ff..183557a124e 100644 --- a/Mage.Sets/src/mage/cards/n/NissasEncouragement.java +++ b/Mage.Sets/src/mage/cards/n/NissasEncouragement.java @@ -154,7 +154,7 @@ class NissasEncouragementTarget extends TargetCardInLibrary { return false; } } - return filter.match(card, playerId, game); + return filter.match(card, playerId, source, game); } return false; } diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaValueInGraveyard.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaValueInGraveyard.java index 752a637cde0..97a0fae8e9d 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaValueInGraveyard.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaValueInGraveyard.java @@ -46,7 +46,7 @@ public class ManaValueInGraveyard implements DynamicValue { return 0; } int value = player.getGraveyard().stream().map(game::getCard).filter(Objects::nonNull) - .filter(card -> filter.match(card, playerId, game)).mapToInt(MageObject::getManaValue).sum(); + .filter(card -> filter.match(card, playerId, sourceAbility, game)).mapToInt(MageObject::getManaValue).sum(); if (multiplier != null) { value *= multiplier; } diff --git a/Mage/src/main/java/mage/cards/CardsImpl.java b/Mage/src/main/java/mage/cards/CardsImpl.java index b4f748b29a4..92205a199c3 100644 --- a/Mage/src/main/java/mage/cards/CardsImpl.java +++ b/Mage/src/main/java/mage/cards/CardsImpl.java @@ -99,7 +99,7 @@ public class CardsImpl extends LinkedHashSet implements Cards, Serializabl @Override public int count(FilterCard filter, UUID playerId, Game game) { - return (int) this.stream().filter(card -> filter.match(game.getCard(card), playerId, game)).count(); + return (int) this.stream().filter(card -> filter.match(game.getCard(card), playerId, null, game)).count(); } diff --git a/Mage/src/main/java/mage/filter/FilterCard.java b/Mage/src/main/java/mage/filter/FilterCard.java index ccdb72f6e52..c4eb8cf57ef 100644 --- a/Mage/src/main/java/mage/filter/FilterCard.java +++ b/Mage/src/main/java/mage/filter/FilterCard.java @@ -11,9 +11,7 @@ import mage.game.Game; import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.UUID; -import java.util.stream.Collectors; /** * Works with cards only. For objects like commanders you must override your canTarget method. @@ -56,10 +54,6 @@ public class FilterCard extends FilterObject { return super.match(card, game); } - public boolean match(Card card, UUID playerId, Game game) { - return match(card, playerId, null, game); - } - public boolean match(Card card, UUID playerId, Ability source, Game game) { if (!this.match(card, game)) { return false; @@ -80,10 +74,6 @@ public class FilterCard extends FilterObject { extraPredicates.add(predicate); } - public Set filter(Set cards, Game game) { - return cards.stream().filter(card -> match(card, game)).collect(Collectors.toSet()); - } - public boolean hasPredicates() { return !predicates.isEmpty() || !extraPredicates.isEmpty(); } diff --git a/Mage/src/main/java/mage/target/TargetCard.java b/Mage/src/main/java/mage/target/TargetCard.java index e0ef2ba5bfe..f31d49cab94 100644 --- a/Mage/src/main/java/mage/target/TargetCard.java +++ b/Mage/src/main/java/mage/target/TargetCard.java @@ -180,7 +180,7 @@ public class TargetCard extends TargetObject { int possibleTargets = 0; for (Card card : game.getExile().getPermanentExile().getCards(game)) { if (sourceId == null || isNotTarget || !game.replaceEvent(new TargetEvent(card, sourceId, sourceControllerId))) { - if (filter.match(card, player.getId(), game)) { + if (filter.match(card, player.getId(), source, game)) { possibleTargets++; if (possibleTargets >= countUpTo) { return possibleTargets; // early return for faster computation. diff --git a/Mage/src/main/java/mage/target/common/TargetCardInExile.java b/Mage/src/main/java/mage/target/common/TargetCardInExile.java index 50a71d6636b..c1d0ed82e17 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInExile.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInExile.java @@ -75,7 +75,7 @@ public class TargetCardInExile extends TargetCard { ExileZone exileZone = game.getExile().getExileZone(zoneId); if (exileZone != null) { for (Card card : exileZone.getCards(game)) { - if (filter.match(card, sourceControllerId, game)) { + if (filter.match(card, sourceControllerId, source, game)) { possibleTargets.add(card.getId()); } } diff --git a/Mage/src/main/java/mage/target/common/TargetDiscard.java b/Mage/src/main/java/mage/target/common/TargetDiscard.java index 854230c9eaf..4e732d8ba09 100644 --- a/Mage/src/main/java/mage/target/common/TargetDiscard.java +++ b/Mage/src/main/java/mage/target/common/TargetDiscard.java @@ -47,7 +47,7 @@ public class TargetDiscard extends TargetCard { @Override public boolean canTarget(UUID id, Ability source, Game game) { Card card = game.getPlayer(playerId).getHand().get(id, game); - return filter.match(card, source.getControllerId(), game); + return filter.match(card, source.getControllerId(), source, game); } @Override