External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed possible NPE in CardView (fixes #278).

Browse source
This commit is contained in:
LevelX2 2013-08-28 16:23:04 +02:00
parent 2dd4a32048
commit ae697db2d8
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/cards/Permanent.java
View file

@ -101,6 +101,7 @@ public class Permanent extends Card {
protected String getText(String cardType) { protected String getText(String cardType) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(super.getText(cardType)); sb.append(super.getText(cardType));
if (permanent.getOriginal() != null) {
sb.append("\n----- Originally -------\n"); sb.append("\n----- Originally -------\n");
sb.append(permanent.getOriginal().getName()); sb.append(permanent.getOriginal().getName());
if (permanent.getOriginal().getManaCost().size() > 0) { if (permanent.getOriginal().getManaCost().size() > 0) {
@ -125,6 +126,7 @@ public class Permanent extends Card {
sb.append(permanent.getOriginal().getRarity().toString()); sb.append(permanent.getOriginal().getRarity().toString());
} }
// sb.append("\n").append(card.getId()); // sb.append("\n").append(card.getId());
}
return sb.toString(); return sb.toString();
} }

4
Mage.Common/src/mage/view/PermanentView.java
View file

@ -70,7 +70,11 @@ public class PermanentView extends CardView {
original.expansionSetCode = permanent.getExpansionSetCode(); original.expansionSetCode = permanent.getExpansionSetCode();
} }
else { else {
if (card != null) {
original = new CardView(card); original = new CardView(card);
} else {
original = null;
}
} }
this.transformed = permanent.isTransformed(); this.transformed = permanent.isTransformed();
} }