- Fixed Mana Reflection.

Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java

@@ -42,6 +42,7 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ManaEvent;
+import mage.watchers.common.PermanentTappedForManaWatcher;
 
 /**
  *
@@ -50,13 +51,14 @@ import mage.game.events.ManaEvent;
 public class ManaReflection extends CardImpl {
 
     public ManaReflection(UUID ownerId) {
-        super(ownerId, 122, "Mana Reflection", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}");
+        super(ownerId, 122, "Mana Reflection", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}{G}");
         this.expansionSetCode = "SHM";
 
         this.color.setGreen(true);
 
         // If you tap a permanent for mana, it produces twice as much of that mana instead.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaReflectionReplacementEffect()));
+        this.addWatcher(new PermanentTappedForManaWatcher());
 
     }
 
@@ -115,8 +117,15 @@ class ManaReflectionReplacementEffect extends ReplacementEffectImpl {
         if (event.getType() == GameEvent.EventType.ADD_MANA
                 && event.getPlayerId().equals(source.getControllerId())
                 && game.getPermanentOrLKIBattlefield(event.getSourceId()) != null) {
+            UUID permanentId = game.getPermanentOrLKIBattlefield(event.getSourceId()).getId();
+            PermanentTappedForManaWatcher watcher = (PermanentTappedForManaWatcher) game.getState().getWatchers().get("PermanentTappedForMana");
+            if (watcher != null) {
+                if (watcher.permanentId.contains(permanentId)) {
+                    watcher.permanentId.remove(permanentId);
                     return true;
                 }
+            }
+        }
         return false;
     }
 
@@ -124,5 +133,4 @@ class ManaReflectionReplacementEffect extends ReplacementEffectImpl {
     public ManaReflectionReplacementEffect copy() {
         return new ManaReflectionReplacementEffect(this);
     }
-
 }

Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java

@@ -64,7 +64,7 @@ public class MossbridgeTroll extends CardImpl {
     }
 
     public MossbridgeTroll(UUID ownerId) {
-        super(ownerId, 123, "Mossbridge Troll", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}");
+        super(ownerId, 123, "Mossbridge Troll", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{G}{G}");
         this.expansionSetCode = "SHM";
         this.subtype.add("Troll");
 

Mage/src/mage/watchers/common/PermanentTappedForManaWatcher.java

@@ -0,0 +1,76 @@
+/*
+ *  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.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.watchers.Watcher;
+
+/**
+ * @author jeffwadsworth
+ */
+
+public class PermanentTappedForManaWatcher extends Watcher {
+
+    public List<UUID> permanentId = new ArrayList<>();
+
+    public PermanentTappedForManaWatcher() {
+        super("PermanentTappedForMana", WatcherScope.GAME);
+    }
+
+    public PermanentTappedForManaWatcher(final PermanentTappedForManaWatcher watcher) {
+        super(watcher);
+    }
+
+    @Override
+    public PermanentTappedForManaWatcher copy() {
+        return new PermanentTappedForManaWatcher(this);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA) {
+            Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId());
+            if (permanent != null) {
+                permanentId.add(permanent.getId());
+            }
+        }
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        permanentId.clear();
+    }
+}