From 39171f050d409e2890056bd34ac232f53430fa02 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 10 Nov 2011 21:22:14 +0000 Subject: [PATCH] - Removed the unused variable uncastable from the card class. --- src/main/java/forge/Card.java | 28 +------------------ src/main/java/forge/GameActionUtil.java | 4 +-- .../java/forge/card/spellability/Spell.java | 4 --- .../java/forge/gui/game/CardDetailPanel.java | 8 ------ 4 files changed, 3 insertions(+), 41 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 0a76b02f2d1..6ff9a3c4073 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -213,7 +213,6 @@ public class Card extends GameEntity implements Comparable { private Map dealtDamageToThisTurn = new TreeMap(); private Map assignedDamageMap = new TreeMap(); - private boolean unCastable; private boolean drawnThisTurn = false; private boolean tapped; private boolean sickness = true; // summoning sickness @@ -4923,31 +4922,6 @@ public class Card extends GameEntity implements Comparable { setTapped(false); } - /** - *

- * isUnCastable. - *

- * - * @return a boolean. - */ - public final boolean isUnCastable() { - - return unCastable; - } - - /** - *

- * Setter for the field unCastable. - *

- * - * @param b - * a boolean. - */ - public final void setUnCastable(final boolean b) { - unCastable = b; - updateObservers(); - } - // keywords are like flying, fear, first strike, etc... /** *

@@ -6555,7 +6529,7 @@ public class Card extends GameEntity implements Comparable { } else { String restriction = property.split("SharesColorWith ")[1]; if (restriction.equals("TopCardOfLibrary")) { - CardList list = this.getOwner().getCardsIn(Zone.Library); + CardList list = sourceController.getCardsIn(Zone.Library); if (list.isEmpty() || !sharesColorWith(list.get(0))) { return false; } diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 2cb7ae3da77..7a14d7bda6c 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -121,7 +121,7 @@ public final class GameActionUtil { } // while GuiUtils.getChoiceOptional("Revealed cards:", revealed.toArray()); - if (cascadedCard != null && !cascadedCard.isUnCastable()) { + if (cascadedCard != null) { if (cascadedCard.getController().isHuman()) { StringBuilder title = new StringBuilder(); @@ -249,7 +249,7 @@ public final class GameActionUtil { } // for GuiUtils.getChoiceOptional("Revealed cards:", revealed.toArray()); for (int i = 0; i < rippleMax; i++) { - if (rippledCards[i] != null && !rippledCards[i].isUnCastable()) { + if (rippledCards[i] != null) { if (rippledCards[i].getController().isHuman()) { Object[] possibleValues = { "Yes", "No" }; diff --git a/src/main/java/forge/card/spellability/Spell.java b/src/main/java/forge/card/spellability/Spell.java index 64f6e1c5163..0e893967788 100644 --- a/src/main/java/forge/card/spellability/Spell.java +++ b/src/main/java/forge/card/spellability/Spell.java @@ -90,10 +90,6 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable } } - if (card.isUnCastable()) { - return false; - } - if (this.getPayCosts() != null) { if (!CostPayment.canPayAdditionalCosts(this.getPayCosts(), this)) { return false; diff --git a/src/main/java/forge/gui/game/CardDetailPanel.java b/src/main/java/forge/gui/game/CardDetailPanel.java index 23f8b3dd25d..24daac966aa 100644 --- a/src/main/java/forge/gui/game/CardDetailPanel.java +++ b/src/main/java/forge/gui/game/CardDetailPanel.java @@ -410,14 +410,6 @@ public class CardDetailPanel extends JPanel implements CardContainer { area.append("^"); } - // uncastable - if (card.isUnCastable()) { - if (area.length() != 0) { - area.append("\n"); - } - area.append("This card can't be cast."); - } - // must block if (!card.getMustBlockCards().isEmpty()) { if (area.length() != 0) {