diff --git a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java index 44c3ae7be3..1d18630c91 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java +++ b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java @@ -128,9 +128,9 @@ class ScreechingBatTransformSourceEffect extends OneShotEffect { Card card = permanent.getSecondCardFace(); + if (card == null) { + return false; + } + permanent.setName(card.getName()); permanent.getColor().setColor(card.getColor()); permanent.getManaCost().clear(); diff --git a/Mage/src/mage/cards/Card.java b/Mage/src/mage/cards/Card.java index 6516ea4ee4..36a8e72255 100644 --- a/Mage/src/mage/cards/Card.java +++ b/Mage/src/mage/cards/Card.java @@ -61,13 +61,11 @@ public interface Card extends MageObject { public boolean isFaceDown(); public boolean canTransform(); - public void setCanTransform(boolean value); public Card getSecondCardFace(); - public void setSecondCardFace(Card card); - public boolean isNightCard(); public void assignNewId(); + /** * Moves the card to the specified zone * @param zone diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java index 64e262c891..1fa0a486af 100644 --- a/Mage/src/mage/cards/CardImpl.java +++ b/Mage/src/mage/cards/CardImpl.java @@ -387,13 +387,4 @@ public abstract class CardImpl> extends MageObjectImpl return this.nightCard; } - @Override - public void setCanTransform(boolean canTransform) { - this.canTransform = canTransform; - } - - @Override - public void setSecondCardFace(Card card) { - this.secondSideCard = card; - } } diff --git a/Mage/src/mage/game/permanent/token/Token.java b/Mage/src/mage/game/permanent/token/Token.java index 798482b47a..c9970c7461 100644 --- a/Mage/src/mage/game/permanent/token/Token.java +++ b/Mage/src/mage/game/permanent/token/Token.java @@ -47,8 +47,6 @@ public class Token extends MageObjectImpl { protected String description; private UUID lastAddedTokenId; - private boolean canTransform; - private Card secondCardFace; public Token(String name, String description) { this.name = name; @@ -70,7 +68,6 @@ public class Token extends MageObjectImpl { public Token(final Token token) { super(token); this.description = token.description; - this.canTransform = token.canTransform; } public String getDescription() { @@ -99,10 +96,6 @@ public class Token extends MageObjectImpl { amount = event.getAmount(); for (int i = 0; i < amount; i++) { PermanentToken permanent = new PermanentToken(this, controllerId, setCode); - if (this.canTransform) { - permanent.setCanTransform(this.canTransform); - permanent.setSecondCardFace(this.secondCardFace); - } game.getBattlefield().addPermanent(permanent); this.lastAddedTokenId = permanent.getId(); permanent.entersBattlefield(sourceId, game); @@ -113,12 +106,4 @@ public class Token extends MageObjectImpl { } return false; } - - public void setCanTransform(boolean canTransform) { - this.canTransform = canTransform; - } - - public void setSecondCardFace(Card card) { - this.secondCardFace = card; - } } diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java index d89441c6fe..33d3267961 100644 --- a/Mage/src/mage/game/stack/Spell.java +++ b/Mage/src/mage/game/stack/Spell.java @@ -351,10 +351,6 @@ public class Spell> implements StackObject, Card { return false; } - @Override - public void setCanTransform(boolean value) { - } - @Override public Card getSecondCardFace() { return null; @@ -440,9 +436,5 @@ public class Spell> implements StackObject, Card { public void setCopiedSpell(boolean isCopied) { this.copiedSpell = isCopied; } - - @Override - public void setSecondCardFace(Card card) { - } } diff --git a/Mage/src/mage/util/functions/CopyFunction.java b/Mage/src/mage/util/functions/CopyFunction.java index 5c8db865a1..d994f11805 100644 --- a/Mage/src/mage/util/functions/CopyFunction.java +++ b/Mage/src/mage/util/functions/CopyFunction.java @@ -79,11 +79,6 @@ public class CopyFunction implements Function { target.getPower().setValue(source.getPower().getValue()); target.getToughness().setValue(source.getToughness().getValue()); - if (source.canTransform()) { - target.setCanTransform(true); - target.setSecondCardFace(source.getSecondCardFace()); - } - return target; } diff --git a/Mage/src/mage/util/functions/CopyTokenFunction.java b/Mage/src/mage/util/functions/CopyTokenFunction.java index 9e41b453d2..19dafe170e 100644 --- a/Mage/src/mage/util/functions/CopyTokenFunction.java +++ b/Mage/src/mage/util/functions/CopyTokenFunction.java @@ -80,11 +80,6 @@ public class CopyTokenFunction implements Function { target.getPower().setValue(source.getPower().getValue()); target.getToughness().setValue(source.getToughness().getValue()); - if (source.canTransform()) { - target.setCanTransform(true); - target.setSecondCardFace(source.getSecondCardFace()); - } - return target; }