From 5d19fe75839b44c77b06bfa1ea53725316bd7b61 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Tue, 14 May 2024 22:15:44 -0400
Subject: [PATCH] fix #12247 (Danse Macabre)

---
 Mage.Sets/src/mage/cards/d/DanseMacabre.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/d/DanseMacabre.java b/Mage.Sets/src/mage/cards/d/DanseMacabre.java
index b84c31e6881..2ad98aefbb0 100644
--- a/Mage.Sets/src/mage/cards/d/DanseMacabre.java
+++ b/Mage.Sets/src/mage/cards/d/DanseMacabre.java
@@ -10,16 +10,13 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
-import mage.filter.FilterPermanent;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterCreatureCard;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardIdPredicate;
-import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
-import mage.target.TargetPermanent;
 import mage.target.common.TargetCardInGraveyard;
 import mage.target.common.TargetSacrifice;
 
@@ -82,7 +79,7 @@ class DanseMacabreEffect extends OneShotEffect {
         for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
             Player player = game.getPlayer(playerId);
             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) {
                 continue;
             }
@@ -103,10 +100,10 @@ class DanseMacabreEffect extends OneShotEffect {
         if (cards.isEmpty()) {
             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(
                 cards.stream()
-                        .map(cardId -> new CardIdPredicate(cardId))
+                        .map(CardIdPredicate::new)
                         .collect(Collectors.toSet())
         ));
         TargetCardInGraveyard target;