From cf4dbf6ed9021a0e27f8fe87bac6b293bb120792 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 18 Apr 2021 09:02:41 +0200 Subject: [PATCH] Fix wrong activator --- forge-game/src/main/java/forge/game/card/CardUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java index 7a557e4e164..1a9ec8ce62f 100644 --- a/forge-game/src/main/java/forge/game/card/CardUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardUtil.java @@ -425,8 +425,8 @@ public final class CardUtil { if (sa.getActivatingPlayer() == null) { sa.setActivatingPlayer(sa.getHostCard().getController()); } - final Game game = sa.getActivatingPlayer().getGame(); - cards = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), validCard, abMana.getActivatingPlayer(), card, sa); + final Player activator = sa.getActivatingPlayer(); + cards = CardLists.getValidCards(activator.getGame().getCardsIn(ZoneType.Battlefield), validCard, activator, card, sa); } // remove anything cards that is already in parents