[C19] fixed Gerrard, Weatherlight Hero returning all cards and not just ones which were put there this turn

This commit is contained in:
Evan Kranzler 2021-05-03 20:39:31 -04:00
parent a641ac5e6e
commit 3d015a50a0

View file

@ -11,6 +11,7 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.card.PutIntoGraveFromBattlefieldThisTurnPredicate;
import mage.game.Game; import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import mage.watchers.common.CardsPutIntoGraveyardWatcher; import mage.watchers.common.CardsPutIntoGraveyardWatcher;
@ -55,6 +56,7 @@ class GerrardWeatherlightHeroEffect extends OneShotEffect {
private static final FilterCard filter = new FilterCard(); private static final FilterCard filter = new FilterCard();
static { static {
filter.add(PutIntoGraveFromBattlefieldThisTurnPredicate.instance);
filter.add(Predicates.or( filter.add(Predicates.or(
CardType.ARTIFACT.getPredicate(), CardType.ARTIFACT.getPredicate(),
CardType.CREATURE.getPredicate() CardType.CREATURE.getPredicate()