From a239fd0dda00c4ab7f515f5815c6277d74f36e4a Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 29 Apr 2020 18:42:29 -0400 Subject: [PATCH] fixed graveyard count not correctly using filters --- .../common/CardsInControllerGraveyardCount.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java index 3242e4d845d..6702e42e1d9 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java @@ -9,13 +9,12 @@ import mage.game.Game; import mage.players.Player; /** - * * @author North */ public class CardsInControllerGraveyardCount implements DynamicValue { - private FilterCard filter; - private Integer amount; + private final FilterCard filter; + private final Integer amount; public CardsInControllerGraveyardCount() { this(StaticFilters.FILTER_CARD, 1); @@ -39,7 +38,9 @@ public class CardsInControllerGraveyardCount implements DynamicValue { public int calculate(Game game, Ability sourceAbility, Effect effect) { Player player = game.getPlayer(sourceAbility.getControllerId()); if (player != null) { - return amount * player.getGraveyard().count(filter, game); + return amount * player.getGraveyard().count( + filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game + ); } return 0; }