From 15a52461a79dbb63a92cf6502c1ec47c386a9edf Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 21 Mar 2013 09:10:34 +0000 Subject: [PATCH] - Removed two unnecessary variables in the card class. --- src/main/java/forge/Card.java | 61 ------------------- .../card/cardfactory/CardFactoryUtil.java | 5 -- 2 files changed, 66 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 5c31bf8c8b2..d4f8fd3e7c8 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -114,7 +114,6 @@ public class Card extends GameEntity implements Comparable { // if this card is an Aura, what Entity is it enchanting? private GameEntity enchanting = null; - private ArrayList choicesMade = null; private ArrayList optionalAdditionalCostsPaid = null; // changes by AF animate and continuous static effects @@ -152,7 +151,6 @@ public class Card extends GameEntity implements Comparable { private boolean levelUp = false; - private boolean unearth = false; private boolean unearthed; private boolean suspendCast = false; @@ -3029,42 +3027,6 @@ public class Card extends GameEntity implements Comparable { return this.copiedSpell; } - /** - *

- * setSpellChoice. - *

- * - * @param strings - * a ArrayList object. - */ - public final void setSpellChoice(final ArrayList strings) { - this.choicesMade = strings; - } - - /** - *

- * getChoices. - *

- * - * @return a {@link java.util.ArrayList} object. - */ - public final ArrayList getChoices() { - return this.choicesMade; - } - - /** - *

- * getChoice. - *

- * - * @param i - * a int. - * @return a {@link java.lang.String} object. - */ - public final String getChoice(final int i) { - return this.choicesMade.get(i); - } - /** *

* setSpellWithChoices. @@ -5546,29 +5508,6 @@ public class Card extends GameEntity implements Comparable { return this.getName() + " (" + this.getUniqueNumber() + ")"; } - /** - *

- * hasUnearth. - *

- * - * @return a boolean. - */ - public final boolean hasUnearth() { - return this.unearth; - } - - /** - *

- * Setter for the field unearth. - *

- * - * @param b - * a boolean. - */ - public final void setUnearth(final boolean b) { - this.unearth = b; - } - /** *

* isUnearthed. diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index f7c91c15f0d..af7877e5ca3 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -916,10 +916,6 @@ public class CardFactoryUtil { cl = Iterables.filter(cl, new Predicate() { @Override public boolean apply(final Card c) { - if (zone.is(ZoneType.Graveyard) && c.hasUnearth()) { - return true; - } - if (c.hasKeyword("You may look at this card.")) { return true; } @@ -3575,7 +3571,6 @@ public class CardFactoryUtil { final String manacost = k[1]; card.addSpellAbility(CardFactoryUtil.abilityUnearth(card, manacost)); - card.setUnearth(true); } } // unearth