From 70bd3fe6d27ee72c5129efa8a7168d0342c30ea4 Mon Sep 17 00:00:00 2001
From: Zzooouhh <Zzooouhh@users.noreply.github.com>
Date: Thu, 12 Oct 2017 18:27:35 +0200
Subject: [PATCH] Moved SkipUntapStepEffect to common effects

---
 Mage.Sets/src/mage/cards/s/SandsOfTime.java | 28 +--------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/s/SandsOfTime.java b/Mage.Sets/src/mage/cards/s/SandsOfTime.java
index 05f28b163ae..14699d169d9 100644
--- a/Mage.Sets/src/mage/cards/s/SandsOfTime.java
+++ b/Mage.Sets/src/mage/cards/s/SandsOfTime.java
@@ -32,8 +32,8 @@ import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.SkipUntapStepEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -45,7 +45,6 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
@@ -75,31 +74,6 @@ public class SandsOfTime extends CardImpl {
     }
 }
 
-class SkipUntapStepEffect extends ContinuousRuleModifyingEffectImpl {
-
-    public SkipUntapStepEffect() {
-        super(Duration.WhileOnBattlefield, Outcome.Neutral, false, false);
-        staticText = "Players skip their untap steps";
-    }
-
-    public SkipUntapStepEffect(final SkipUntapStepEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public SkipUntapStepEffect copy() {
-        return new SkipUntapStepEffect(this);
-    }
-
-    @Override
-    public boolean applies(GameEvent event, Ability source, Game game) {
-        Player controller = game.getPlayer(source.getControllerId());
-        return event.getType() == GameEvent.EventType.UNTAP_STEP
-                && controller != null
-                && game.getState().getPlayersInRange(controller.getId(), game).contains(event.getPlayerId());
-    }
-}
-
 class SandsOfTimeEffect extends OneShotEffect {
 
     private static final FilterControlledPermanent filter = new FilterControlledPermanent();