External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #12247 (Danse Macabre)

Browse source
This commit is contained in:
xenohedron 2024-05-14 22:15:44 -04:00
parent a95b988ac7
commit 5d19fe7583
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage.Sets/src/mage/cards/d/DanseMacabre.java
View file

@ -10,16 +10,13 @@ import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.FilterPermanent;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.mageobject.CardIdPredicate;
import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import mage.target.TargetPermanent;
import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInGraveyard;
import mage.target.common.TargetSacrifice; import mage.target.common.TargetSacrifice;
@ -82,7 +79,7 @@ class DanseMacabreEffect extends OneShotEffect {
for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player == null || game.getBattlefield().count( if (player == null || game.getBattlefield().count(
StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN, source.getControllerId(), source, game StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN, playerId, source, game
) < 1) { ) < 1) {
continue; continue;
} }
@ -103,10 +100,10 @@ class DanseMacabreEffect extends OneShotEffect {
if (cards.isEmpty()) { if (cards.isEmpty()) {
return true; return true;
} }
FilterCard filterCard = new FilterCard("card put into a graveyard this way"); FilterCard filterCard = new FilterCreatureCard("creature card put into a graveyard this way");
filterCard.add(Predicates.or( filterCard.add(Predicates.or(
cards.stream() cards.stream()
.map(cardId -> new CardIdPredicate(cardId)) .map(CardIdPredicate::new)
.collect(Collectors.toSet()) .collect(Collectors.toSet())
)); ));
TargetCardInGraveyard target; TargetCardInGraveyard target;