diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java index d5acd7dfdca..92fc1ec5fff 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java @@ -714,16 +714,17 @@ public class ConquestMultiverseScreen extends FScreen { private class AvatarDisplay extends FDisplayObject { private final boolean forOpponent; private PaperCard card; - private CardAvatarImage image; + private FImage image; private AvatarDisplay(boolean forOpponent0) { forOpponent = forOpponent0; + image = FSkinImage.UNKNOWN; } public void setCard(PaperCard card0) { if (card == card0) { return; } card = card0; - image = card != null ? new CardAvatarImage(card) : null; + image = card != null ? new CardAvatarImage(card) : FSkinImage.UNKNOWN; } @Override diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java index c67815a0fad..d43f876bdff 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java @@ -47,9 +47,11 @@ public class ConquestEvent { public Deck getDeck() { if (deck == null) { - File deckFile = new File(deckPath); - if (deckFile.exists()) { - deck = DeckSerializer.fromFile(deckFile); + if (deckPath != null) { + File deckFile = new File(deckPath); + if (deckFile.exists()) { + deck = DeckSerializer.fromFile(deckFile); + } } if (deck == null || deck.isEmpty()) { //if deck can't be loaded, generate it randomly @@ -72,7 +74,7 @@ public class ConquestEvent { } public PaperCard getAvatarCard() { - if (avatarCard == null) { + if (avatarCard == null && avatar != null) { //attempt to load card from plane's card pool avatarCard = region.getPlane().getCardPool().getCard(avatar); if (avatarCard == null) { @@ -84,6 +86,9 @@ public class ConquestEvent { } public String getOpponentName() { + if (avatar == null) { + return name; + } String name = avatar; int idx = name.indexOf(','); if (idx != -1) { //trim everything after the comma