From ef9ab0769de0e4aa63f00f486d04ff1e65dacbbe Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 19 Jun 2016 16:39:22 +0200 Subject: [PATCH] =?UTF-8?q?*=20Glimmervoid=20-=20Fixed=20that=20the=20cond?= =?UTF-8?q?ition=20was=20not=20implemented=20as=20an=20=E2=80=9CIntervenin?= =?UTF-8?q?g=20If=E2=80=9D=20clause.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java index 75ab8e50f0..2b09baaad7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java @@ -68,6 +68,8 @@ public class Glimmervoid extends CardImpl { class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl { + static final FilterArtifactPermanent filter = new FilterArtifactPermanent(); + GlimmervoidTriggeredAbility() { super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); } @@ -81,6 +83,11 @@ class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl { return new GlimmervoidTriggeredAbility(this); } + @java.lang.Override + public boolean checkInterveningIfClause(Game game) { + return game.getBattlefield().countAll(filter, controllerId, game) == 0; + } + @java.lang.Override public boolean checkEventType(GameEvent event, Game game) { return event.getType() == EventType.END_TURN_STEP_PRE; @@ -88,11 +95,7 @@ class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl { @java.lang.Override public boolean checkTrigger(GameEvent event, Game game) { - FilterArtifactPermanent filter = new FilterArtifactPermanent(); - if (!game.getBattlefield().contains(filter, controllerId, 1, game)) { - return true; - } - return false; + return true; } @java.lang.Override