diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java index 9a1a1d219bd..3a035aa3cfb 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java @@ -337,6 +337,7 @@ public class ImageCache { if (card.getUsesVariousArt()) { key += "#usesVariousArt"; } + log.warn("getImage: " + key); BufferedImage original = getImage(key); if (original == null) { log.warn(key + " not found"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java index cc5f6f9911e..19ef9c366cc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java @@ -48,6 +48,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.game.Game; +import mage.game.permanent.Permanent; import mage.sets.tokens.EmptyToken; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -106,10 +107,10 @@ class SplinterTwinEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(source.getSourceId()); - if (card != null) { + Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); + if (permanent != null) { EmptyToken token = new EmptyToken(); - CardUtil.copyTo(token).from(card); + CardUtil.copyTo(token).from(permanent); token.addAbility(HasteAbility.getInstance()); token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); diff --git a/Mage/src/mage/abilities/effects/common/CopyEffect.java b/Mage/src/mage/abilities/effects/common/CopyEffect.java index 31dea81726d..0326ea8e4d5 100644 --- a/Mage/src/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/mage/abilities/effects/common/CopyEffect.java @@ -37,6 +37,7 @@ import mage.game.permanent.Permanent; import java.util.UUID; import mage.game.permanent.PermanentCard; +import mage.game.permanent.PermanentToken; /** * @@ -106,6 +107,9 @@ public class CopyEffect extends ContinuousEffectImpl { if (target instanceof PermanentCard) { permanent.setCardNumber(((PermanentCard) target).getCard().getCardNumber()); permanent.setExpansionSetCode(((PermanentCard) target).getCard().getExpansionSetCode()); + } else if (target instanceof PermanentToken) { + permanent.setCardNumber(((PermanentToken) target).getCardNumber()); + permanent.setExpansionSetCode(((PermanentToken) target).getExpansionSetCode()); } permanent.setCopy(true); diff --git a/Mage/src/mage/util/functions/CopyTokenFunction.java b/Mage/src/mage/util/functions/CopyTokenFunction.java index d21c805458a..c747825d18f 100644 --- a/Mage/src/mage/util/functions/CopyTokenFunction.java +++ b/Mage/src/mage/util/functions/CopyTokenFunction.java @@ -66,6 +66,9 @@ public class CopyTokenFunction implements Function { sourceObj = ((PermanentCard) source).getCard(); target.setOriginalExpansionSetCode(source.getExpansionSetCode()); target.setOriginalCardNumber(source.getCardNumber()); + } else { + target.setOriginalExpansionSetCode(source.getExpansionSetCode()); + target.setOriginalCardNumber(source.getCardNumber()); } target.setName(sourceObj.getName());