external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- NPE guard.

Browse Source
This commit is contained in:
Agetian
2015-06-02 05:12:22 +00:00
parent 6bc4848857
commit 10e991510d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui/src/main/java/forge/card/CardDetailUtil.java
View File

@@ -524,8 +524,11 @@ public class CardDetailUtil {
if (!card.getName().isEmpty()) { if (!card.getName().isEmpty()) {
origPaperCard = FModel.getMagicDb().getCommonCards().getCard(card.getName()); origPaperCard = FModel.getMagicDb().getCommonCards().getCard(card.getName());
} else { } else {
// probably a morph, try to get its identity from the alternate state // probably a morph or manifest, try to get its identity from the alternate state
origPaperCard = FModel.getMagicDb().getCommonCards().getCard(card.getAlternateState().getName()); String altName = card.getAlternateState().getName();
if (!altName.isEmpty()) {
origPaperCard = FModel.getMagicDb().getCommonCards().getCard(card.getAlternateState().getName());
}
} }
if (origPaperCard != null) { if (origPaperCard != null) {
origCard = Card.getCardForUi(origPaperCard); // if null, probably a variant card origCard = Card.getCardForUi(origPaperCard); // if null, probably a variant card