From 9528b991f23ca3d4a4af8ab494a5508dbead50a0 Mon Sep 17 00:00:00 2001 From: nickmyers Date: Wed, 18 Feb 2015 20:55:38 -0600 Subject: [PATCH 1/2] --- Mage.Sets/src/mage/sets/fifthdawn/EonHub.java | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java b/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java index 658b6b9e1a7..f9a79e83b40 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java @@ -9,11 +9,11 @@ import java.util.UUID; import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; -import mage.players.Player; +import mage.game.events.GameEvent.EventType; +import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; /** * @@ -40,7 +40,7 @@ public class EonHub extends CardImpl { } -class SkipUpkeepStepEffect extends ReplacementEffectImpl { +class SkipUpkeepStepEffect extends ContinuousRuleModifiyingEffectImpl { public SkipUpkeepStepEffect() { super(Duration.WhileOnBattlefield, Outcome.Neutral); @@ -56,25 +56,8 @@ class SkipUpkeepStepEffect extends ReplacementEffectImpl { return new SkipUpkeepStepEffect(this); } - @Override - public boolean apply(Game game, Ability source) { - return true; - } - - @Override - public boolean replaceEvent(GameEvent event, Ability source, Game game) { - return true; - } - - @Override - public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.UPKEEP_STEP; - } - @Override public boolean applies(GameEvent event, Ability source, Game game) { - Player controller = game.getPlayer(source.getControllerId()); - return controller != null && controller.getInRange().contains(event.getPlayerId()); + return event.getType() == EventType.UPKEEP_STEP; } - } From 0dcb496b2ef60277a9c2643bc722769b8a010cf0 Mon Sep 17 00:00:00 2001 From: myersn024 Date: Thu, 19 Feb 2015 08:31:03 -0600 Subject: [PATCH 2/2] Updated based on recommendations from LevelX2 --- Mage.Sets/src/mage/sets/fifthdawn/EonHub.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java b/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java index f9a79e83b40..18bf50f6626 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java @@ -14,6 +14,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.players.Player; /** * @@ -43,7 +44,7 @@ public class EonHub extends CardImpl { class SkipUpkeepStepEffect extends ContinuousRuleModifiyingEffectImpl { public SkipUpkeepStepEffect() { - super(Duration.WhileOnBattlefield, Outcome.Neutral); + super(Duration.WhileOnBattlefield, Outcome.Neutral, false, false); staticText = "Players skip their upkeep steps"; } @@ -58,6 +59,7 @@ class SkipUpkeepStepEffect extends ContinuousRuleModifiyingEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - return event.getType() == EventType.UPKEEP_STEP; + Player controller = game.getPlayer(source.getControllerId()); + return event.getType() == EventType.UPKEEP_STEP && controller != null && controller.getInRange().contains(event.getPlayerId()); } }