From 3b69bbf6bfcca28aec80f14a8b7943d6a43c0f13 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 1 Dec 2012 12:31:38 +0000
Subject: [PATCH] - Fixed Coalition Relic.

---
 src/main/java/forge/card/abilityfactory/AbilityFactory.java   | 4 +---
 .../card/abilityfactory/effects/CountersRemoveEffect.java     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
index acb8a4638fa..c964a9e90d4 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
@@ -531,9 +531,7 @@ public class AbilityFactory {
 
             if (calcX[0].startsWith("Count")) {
                 return CardFactoryUtil.xCount(card, calcX[1], ability) * multiplier;
-            }
-
-            if (calcX[0].startsWith("Number")) {
+            } else if (calcX[0].startsWith("Number")) {
                 return CardFactoryUtil.xCount(card, svarval) * multiplier;
             } else if (calcX[0].startsWith("SVar")) {
                 final String[] l = calcX[1].split("/");
diff --git a/src/main/java/forge/card/abilityfactory/effects/CountersRemoveEffect.java b/src/main/java/forge/card/abilityfactory/effects/CountersRemoveEffect.java
index d2131abda5f..26bc637bbe1 100644
--- a/src/main/java/forge/card/abilityfactory/effects/CountersRemoveEffect.java
+++ b/src/main/java/forge/card/abilityfactory/effects/CountersRemoveEffect.java
@@ -147,7 +147,6 @@ public class CountersRemoveEffect extends SpellEffect {
                             counterAmount = Integer.parseInt(o);
                         }
                     }
-                    tgtCard.subtractCounter(CounterType.valueOf(type), counterAmount);
                     if (rememberRemoved) {
                         if (counterAmount > tgtCard.getCounters(CounterType.valueOf(type))) {
                             counterAmount = tgtCard.getCounters(CounterType.valueOf(type));
@@ -156,6 +155,7 @@ public class CountersRemoveEffect extends SpellEffect {
                             card.addRemembered(CounterType.valueOf(type));
                         }
                     }
+                    tgtCard.subtractCounter(CounterType.valueOf(type), counterAmount);
                 }
             }
         }