* Mana pay to cast - fixed wrong mana calc for commanders (example: Marath, Will of the Wild, see #8204);

Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java

@@ -0,0 +1,49 @@
+package org.mage.test.cards.single.c13;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestCommanderDuelBase;
+
+/**
+ * @author JayDi85
+ */
+public class MarathWillOfTheWildTest extends CardTestCommanderDuelBase {
+
+    @Test
+    public void test_Play() {
+        // Marath, Will of the Wild enters the battlefield with a number of +1/+1 counters on it equal
+        // to the amount of mana spent to cast it.
+        addCard(Zone.COMMAND, playerA, "Marath, Will of the Wild", 1); // {R}{G}{W}
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2 + 2); // for second cast
+        //
+        addCard(Zone.HAND, playerA, "Lightning Bolt", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+
+        // cast first
+        activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}", 1);
+        activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G}", 1);
+        activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {W}", 1);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Marath, Will of the Wild");
+        waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
+        checkPermanentCounters("after first cast must have 3x counters", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Marath, Will of the Wild", CounterType.P1P1, 3);
+
+        // kill
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Marath, Will of the Wild");
+        setChoice(playerA, true); // move to command
+        waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
+
+        // cast second with commander tax
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Marath, Will of the Wild");
+        waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
+        checkPermanentCounters("after second cast must have 5x counters", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Marath, Will of the Wild", CounterType.P1P1, 3 + 2);
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        assertAllCommandsUsed();
+    }
+}

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

@@ -92,7 +92,7 @@ public class ManaPaidSourceWatcher extends Watcher {
         switch (event.getType()) {
             case ZONE_CHANGE:
                 if (((ZoneChangeEvent) event).getFromZone() == Zone.BATTLEFIELD) {
-                    manaMap.remove(event.getSourceId());
+                    manaMap.remove(event.getTargetId());
                 }
                 return;
             case MANA_PAID: