diff --git a/Mage.Sets/src/mage/cards/g/GideonsTriumph.java b/Mage.Sets/src/mage/cards/g/GideonsTriumph.java index c56fd444a5f..cd8c9b62420 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsTriumph.java +++ b/Mage.Sets/src/mage/cards/g/GideonsTriumph.java @@ -49,13 +49,13 @@ public final class GideonsTriumph extends CardImpl { class GideonsTriumphEffect extends OneShotEffect { - private static final FilterControlledPlaneswalkerPermanent filter + private static final FilterControlledPlaneswalkerPermanent filterGideon = new FilterControlledPlaneswalkerPermanent(SubType.GIDEON); - private static final FilterPermanent filter2 + private static final FilterPermanent filterSacrifice = new FilterPermanent("creature that attacked or blocked this turn"); static { - filter2.add(GideonsTriumphCondition.instance); + filterSacrifice.add(GideonsTriumphPredicate.instance); } GideonsTriumphEffect() { @@ -76,14 +76,14 @@ class GideonsTriumphEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int count = 1; - if (!game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game).isEmpty()) { + if (!game.getBattlefield().getActivePermanents(filterGideon, source.getControllerId(), game).isEmpty()) { count++; } - return new SacrificeEffect(filter2, count, "Target opponent").apply(game, source); + return new SacrificeEffect(filterSacrifice, count, "Target opponent").apply(game, source); } } -enum GideonsTriumphCondition implements Predicate { +enum GideonsTriumphPredicate implements Predicate { instance; @Override @@ -123,4 +123,9 @@ class GideonsTriumphWatcher extends Watcher { return new GideonsTriumphWatcher(this); } + @Override + public void reset() { + attackedOrBlockedThisTurnCreatures.clear(); + } + }