diff --git a/Mage.Client/src/main/java/mage/client/cards/Permanent.java b/Mage.Client/src/main/java/mage/client/cards/Permanent.java index 8d3af3d42f9..1d89e8c59c4 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Permanent.java +++ b/Mage.Client/src/main/java/mage/client/cards/Permanent.java @@ -101,6 +101,7 @@ public class Permanent extends Card { protected String getText(String cardType) { StringBuilder sb = new StringBuilder(); sb.append(super.getText(cardType)); + if (permanent.getOriginal() != null) { sb.append("\n----- Originally -------\n"); sb.append(permanent.getOriginal().getName()); if (permanent.getOriginal().getManaCost().size() > 0) { @@ -125,6 +126,7 @@ public class Permanent extends Card { sb.append(permanent.getOriginal().getRarity().toString()); } // sb.append("\n").append(card.getId()); + } return sb.toString(); } diff --git a/Mage.Common/src/mage/view/PermanentView.java b/Mage.Common/src/mage/view/PermanentView.java index 09e00e4e419..ef13ff7f01e 100644 --- a/Mage.Common/src/mage/view/PermanentView.java +++ b/Mage.Common/src/mage/view/PermanentView.java @@ -70,7 +70,11 @@ public class PermanentView extends CardView { original.expansionSetCode = permanent.getExpansionSetCode(); } else { - original = new CardView(card); + if (card != null) { + original = new CardView(card); + } else { + original = null; + } } this.transformed = permanent.isTransformed(); }