- Fixed Glyph Keeper. Bug #3180

Mage.Sets/src/mage/cards/g/GlyphKeeper.java

@@ -32,6 +32,7 @@ import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.CounterTargetEffect;
 import mage.abilities.keyword.EmbalmAbility;
 import mage.cards.CardImpl;
@@ -40,7 +41,9 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.target.TargetStackObject;
+import mage.game.permanent.Permanent;
+import mage.target.targetpointer.FixedTarget;
+import mage.watchers.common.NumberOfTimesPermanentTargetedATurnWatcher;
 
 /**
  *
@@ -59,7 +62,7 @@ public class GlyphKeeper extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Whenever Glyph Keeper becomes the target of a spell or ability for the first time in a turn, counter that spell or ability.
-        this.addAbility(new GlyphKeeperAbility());
+        this.addAbility(new GlyphKeeperAbility(), new NumberOfTimesPermanentTargetedATurnWatcher());
 
         // Embalm {5}{U}{U}
         this.addAbility(new EmbalmAbility(new ManaCostsImpl("{5}{U}{U}"), this));
@@ -78,15 +81,12 @@ public class GlyphKeeper extends CardImpl {
 
 class GlyphKeeperAbility extends TriggeredAbilityImpl {
 
-    protected int turnUsed;
-
     public GlyphKeeperAbility() {
         super(Zone.BATTLEFIELD, new CounterTargetEffect(), false);
     }
 
     public GlyphKeeperAbility(final GlyphKeeperAbility ability) {
         super(ability);
-        turnUsed = ability.turnUsed;
     }
 
     @Override
@@ -101,13 +101,18 @@ class GlyphKeeperAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getTargetId().equals(this.getSourceId()) && game.getTurnNum() > turnUsed) {
+        if (event.getTargetId().equals(this.getSourceId())) {
-            this.getTargets().clear();
+            Permanent permanent = game.getPermanent(event.getTargetId());
-            TargetStackObject target = new TargetStackObject();
+            if (permanent != null && permanent.isCreature()) {
-            target.add(event.getSourceId(), game);
+                NumberOfTimesPermanentTargetedATurnWatcher watcher = (NumberOfTimesPermanentTargetedATurnWatcher) game.getState().getWatchers().get(NumberOfTimesPermanentTargetedATurnWatcher.class.getName());
-            this.addTarget(target);
+                if (watcher != null
-            turnUsed = game.getTurnNum();
+                        && watcher.notMoreThanOnceTargetedThisTurn(permanent, game)) {
-            return true;
+                    for (Effect effect : getEffects()) {
+                        effect.setTargetPointer(new FixedTarget(event.getSourceId()));
+                    }
+                    return true;
+                }
+            }
         }
         return false;
     }

Mage.Sets/src/mage/cards/k/KiraGreatGlassSpinner.java

@@ -27,11 +27,8 @@
  */
 package mage.cards.k;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;
 import mage.MageInt;
-import mage.MageObjectReference;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.Effect;
@@ -47,7 +44,7 @@ import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
-import mage.watchers.Watcher;
+import mage.watchers.common.NumberOfTimesPermanentTargetedATurnWatcher;
 
 /**
  *
@@ -72,7 +69,7 @@ public class KiraGreatGlassSpinner extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new GainAbilityControlledEffect(new KiraGreatGlassSpinnerAbility(effect), Duration.WhileOnBattlefield,
                         new FilterCreaturePermanent("creatures"))),
-                new KiraGreatGlassSpinnerWatcher());
+                new NumberOfTimesPermanentTargetedATurnWatcher());
 
     }
 
@@ -111,7 +108,7 @@ class KiraGreatGlassSpinnerAbility extends TriggeredAbilityImpl {
         if (event.getTargetId().equals(this.getSourceId())) {
             Permanent permanent = game.getPermanent(event.getTargetId());
             if (permanent != null && permanent.isCreature()) {
-                KiraGreatGlassSpinnerWatcher watcher = (KiraGreatGlassSpinnerWatcher) game.getState().getWatchers().get(KiraGreatGlassSpinnerWatcher.class.getName());
+                NumberOfTimesPermanentTargetedATurnWatcher watcher = (NumberOfTimesPermanentTargetedATurnWatcher) game.getState().getWatchers().get(NumberOfTimesPermanentTargetedATurnWatcher.class.getName());
                 if (watcher != null && watcher.notMoreThanOnceTargetedThisTurn(permanent, game)) {
                     for (Effect effect : getEffects()) {
                         effect.setTargetPointer(new FixedTarget(event.getSourceId()));
@@ -129,50 +126,3 @@ class KiraGreatGlassSpinnerAbility extends TriggeredAbilityImpl {
     }
 
 }
-
-class KiraGreatGlassSpinnerWatcher extends Watcher {
-
-    private final Map<MageObjectReference, Integer> creaturesTargeted = new HashMap<>();
-
-    public KiraGreatGlassSpinnerWatcher() {
-        super(KiraGreatGlassSpinnerWatcher.class.getName(), WatcherScope.GAME);
-    }
-
-    public KiraGreatGlassSpinnerWatcher(final KiraGreatGlassSpinnerWatcher watcher) {
-        super(watcher);
-        this.creaturesTargeted.putAll(creaturesTargeted);
-    }
-
-    @Override
-    public void watch(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.TARGETED) {
-            Permanent permanent = game.getPermanent(event.getTargetId());
-            if (permanent != null) {
-                MageObjectReference mor = new MageObjectReference(permanent, game);
-                int amount = 0;
-                if (creaturesTargeted.containsKey(mor)) {
-                    amount = creaturesTargeted.get(mor);
-                }
-                creaturesTargeted.put(mor, ++amount);
-            }
-        }
-    }
-
-    public boolean notMoreThanOnceTargetedThisTurn(Permanent creature, Game game) {
-        if (creaturesTargeted.containsKey(new MageObjectReference(creature, game))) {
-            return creaturesTargeted.get(new MageObjectReference(creature, game)) < 2;
-        }
-        return true;
-    }
-
-    @Override
-    public void reset() {
-        super.reset();
-        creaturesTargeted.clear();
-    }
-
-    @Override
-    public KiraGreatGlassSpinnerWatcher copy() {
-        return new KiraGreatGlassSpinnerWatcher(this);
-    }
-}

Mage/src/main/java/mage/watchers/common/NumberOfTimesPermanentTargetedATurnWatcher.java

@@ -0,0 +1,89 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.watchers.common;
+
+import java.util.HashMap;
+import java.util.Map;
+import mage.MageObjectReference;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.watchers.Watcher;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class NumberOfTimesPermanentTargetedATurnWatcher extends Watcher {
+
+    private final Map<MageObjectReference, Integer> permanentsTargeted = new HashMap<>();
+
+    public NumberOfTimesPermanentTargetedATurnWatcher() {
+        super(NumberOfTimesPermanentTargetedATurnWatcher.class.getName(), WatcherScope.GAME);
+    }
+
+    public NumberOfTimesPermanentTargetedATurnWatcher(final NumberOfTimesPermanentTargetedATurnWatcher watcher) {
+        super(watcher);
+        this.permanentsTargeted.putAll(permanentsTargeted);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.TARGETED) {
+            Permanent permanent = game.getPermanent(event.getTargetId());
+            if (permanent != null) {
+                MageObjectReference mor = new MageObjectReference(permanent, game);
+                int amount = 0;
+                if (permanentsTargeted.containsKey(mor)) {
+                    amount = permanentsTargeted.get(mor);
+                }
+                permanentsTargeted.put(mor, ++amount);
+            }
+        }
+    }
+
+    public boolean notMoreThanOnceTargetedThisTurn(Permanent creature, Game game) {
+        if (permanentsTargeted.containsKey(new MageObjectReference(creature, game))) {
+            return permanentsTargeted.get(new MageObjectReference(creature, game)) < 2;
+        }
+        return true;
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        permanentsTargeted.clear();
+    }
+
+    @Override
+    public NumberOfTimesPermanentTargetedATurnWatcher copy() {
+        return new NumberOfTimesPermanentTargetedATurnWatcher(this);
+    }
+}