From 80b41e643ceab5d2e507b91f01b8a308e39486f7 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 05:28:57 +0000 Subject: [PATCH] - Fix for suspend that broke just before submission. --- src/forge/CardFactory.java | 2 +- src/forge/CardFactoryUtil.java | 2 +- src/forge/GameActionUtil.java | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 49b5687c3a1..5b7e384ae9d 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -3445,7 +3445,7 @@ public class CardFactory implements NewConstants { if(n != -1) { String parse = card.getKeyword().get(n).toString(); card.removeIntrinsicKeyword(parse); - + card.setSuspend(true); String k[] = parse.split(":"); final int timeCounters = Integer.parseInt(k[1]); diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java index af05ebe04ef..a78bb87bfca 100644 --- a/src/forge/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -1583,7 +1583,7 @@ public class CardFactoryUtil { suspend.setDescription("Suspend " +suspendCounters + ": "+ suspendCost); suspend.setStackDescription(sourceCard + " suspending for " + suspendCounters + " turns.)"); return suspend; - }//ability_cycle() + }//ability_suspend() public static SpellAbility eqPump_Equip(final Card sourceCard, final int Power, final int Tough, final String[] extrinsicKeywords, final String Manacost) { final Ability equip = new Ability(sourceCard, Manacost) { diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index cadd58c4606..00229b072dd 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -3258,11 +3258,7 @@ public class GameActionUtil { //list = list.getType("Creature"); list = list.filter(new CardListFilter() { public boolean addCard(Card c) { - for(String s : c.getKeyword()){ - if (s.contains("Suspend")) - return true; - } - return false; + return c.hasSuspend(); } });