From 212bb075ee32d586bb602f8884c137837c5f3802 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Sat, 23 Apr 2022 23:42:08 -0400 Subject: [PATCH] fix inverted filter check in BlocksCreatureTriggeredAbility --- .../common/BlocksCreatureTriggeredAbility.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/common/BlocksCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksCreatureTriggeredAbility.java index eafac054f00..42eef29b037 100644 --- a/Mage/src/main/java/mage/abilities/common/BlocksCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BlocksCreatureTriggeredAbility.java @@ -2,12 +2,12 @@ package mage.abilities.common; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; -import mage.abilities.keyword.FlyingAbility; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; +import mage.util.CardUtil; /** * @author Hiddevb @@ -17,8 +17,7 @@ public class BlocksCreatureTriggeredAbility extends TriggeredAbilityImpl { private final FilterCreaturePermanent filter; public BlocksCreatureTriggeredAbility(Effect effect, boolean optional) { - super(Zone.BATTLEFIELD, effect, optional); - this.filter = StaticFilters.FILTER_PERMANENT_CREATURE; + this(effect, StaticFilters.FILTER_PERMANENT_CREATURE, optional); } public BlocksCreatureTriggeredAbility(Effect effect, FilterCreaturePermanent filter, boolean optional) { @@ -39,18 +38,16 @@ public class BlocksCreatureTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { return event.getSourceId().equals(this.getSourceId()) - && !filter.match(game.getPermanent(event.getSourceId()), game); + && filter.match(game.getPermanent(event.getTargetId()), getControllerId(), this, game); } @Override public String getTriggerPhrase() { - return "Whenever {this} blocks " - + (filter.getMessage().startsWith("an ") ? "" : "a ") - + filter.getMessage() + ", " ; + return "Whenever {this} blocks " + CardUtil.addArticle(filter.getMessage()) + ", "; } @Override public BlocksCreatureTriggeredAbility copy() { return new BlocksCreatureTriggeredAbility(this); } -} \ No newline at end of file +}