From c44876d1e032fac1cd635cf5c0a08c7679cf5e4c Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Sat, 16 Jul 2016 04:29:43 +0000
Subject: [PATCH] Card: hasProperty cmc uses AbilityUtils.calculateAmount to
 get the compared value

---
 forge-game/src/main/java/forge/game/card/Card.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 1b8362b4298..52a820ea5c5 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -4938,7 +4938,7 @@ public class Card extends GameEntity implements Comparable<Card> {
             try {
                 x = Integer.parseInt(rhs);
             } catch (final NumberFormatException e) {
-                x = CardFactoryUtil.xCount(source, source.getSVar(rhs));
+                x = AbilityUtils.calculateAmount(source, source.getSVar(rhs), spellAbility);
 
                 // TODO: find a better solution for handling Count$TopOfLibraryCMC for split cards
                 // (currently two CMCs are encoded in one big integer value)