diff --git a/forge-gui-mobile/src/forge/adventure/data/EffectData.java b/forge-gui-mobile/src/forge/adventure/data/EffectData.java index 92d7a6281da..0dd8ba17424 100644 --- a/forge-gui-mobile/src/forge/adventure/data/EffectData.java +++ b/forge-gui-mobile/src/forge/adventure/data/EffectData.java @@ -2,6 +2,8 @@ package forge.adventure.data; import com.badlogic.gdx.utils.Array; import forge.item.IPaperCard; +import forge.item.PaperCard; +import forge.item.PaperToken; import forge.model.FModel; public class EffectData { @@ -18,12 +20,13 @@ public class EffectData { Array startCards=new Array<>(); if(startBattleWithCard != null) { for (String name:startBattleWithCard) { - if(FModel.getMagicDb().getCommonCards().contains(name)) - startCards.add(FModel.getMagicDb().getCommonCards().getCard(name)); - else if (FModel.getMagicDb().getAllTokens().containsRule(name)) - startCards.add(FModel.getMagicDb().getAllTokens().getToken(name)); + PaperCard C = FModel.getMagicDb().getCommonCards().getCard(name); + if(C != null) + startCards.add(C); else { - System.err.print("Can not find card "+name+"\n"); + PaperToken T = FModel.getMagicDb().getAllTokens().getToken(name); + if (T != null) startCards.add(T); + else System.err.print("Can not find card \"" + name + "\"\n"); } } }