From 4c73af527c7b72f9daf824e92be4336747f44ddd Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Thu, 1 Aug 2013 08:58:33 +0000
Subject: [PATCH] - Fixed Grindstone.

---
 res/cardsfolder/g/grindstone.txt                   | 3 ++-
 src/main/java/forge/card/ability/AbilityUtils.java | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/res/cardsfolder/g/grindstone.txt b/res/cardsfolder/g/grindstone.txt
index 124c8fcc1d7..48ee928602f 100644
--- a/res/cardsfolder/g/grindstone.txt
+++ b/res/cardsfolder/g/grindstone.txt
@@ -1,7 +1,8 @@
 Name:Grindstone
 ManaCost:1
 Types:Artifact
-A:AB$ Repeat | Cost$ 3 T | ValidTgts$ Player | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesColor | RepeatSVarCompare$ EQ2 | SubAbility$ DBCleanup | SpellDescription$ Put the top two cards of target player's library into that player's graveyard. If both cards share a color, repeat this process. | StackDescription$ SpellDescription
+A:AB$ Mill | Cost$ 3 T | ValidTgts$ Player | NumCards$ 2 | SubAbility$ DBRepeat | RememberMilled$ True | SpellDescription$ Put the top two cards of target player's library into that player's graveyard. If both cards share a color, repeat this process. | StackDescription$ SpellDescription
+SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesColor | RepeatSVarCompare$ EQ2 | SubAbility$ DBCleanup | References$ MaxRepeats,MilledSharesColor | StackDescription$ None
 SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBPeek
 SVar:DBPeek:DB$ PeekAndReveal | Defined$ Targeted | PeekAmount$ 2 | NoPeek$ True | NoReveal$ True | RememberPeeked$ True | SubAbility$ DBGrind
 SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted
diff --git a/src/main/java/forge/card/ability/AbilityUtils.java b/src/main/java/forge/card/ability/AbilityUtils.java
index 7c7eeee1639..f428498fc10 100644
--- a/src/main/java/forge/card/ability/AbilityUtils.java
+++ b/src/main/java/forge/card/ability/AbilityUtils.java
@@ -332,10 +332,7 @@ public class AbilityUtils {
             if (amount.startsWith("Cost")) {
                 return 0;
             }
-        }
-
-        // Nothing to do here if value is missing or blank
-        if (StringUtils.isBlank(svarval)) {
+            // Nothing to do here if value is missing or blank
             System.err.printf("SVar '%s' not defined in Card (%s)%n", amount, card.getName());
             return 0;
         }
@@ -349,7 +346,7 @@ public class AbilityUtils {
         final String[] calcX = svarval.split("\\$", 2);
 
         // Incorrect parses mean zero.
-        if ((calcX.length == 1) || calcX[1].equals("none")) {
+        if (calcX.length == 1 || calcX[1].equals("none")) {
             return 0;
         }
 
@@ -408,6 +405,7 @@ public class AbilityUtils {
                         list.add((Card) o);
                     }
                 }
+                System.out.println("RememberedLKI " + ability + list);
             } else {
                 for (final Object o : newCard.getRemembered()) {
                     if (o instanceof Card) {