From 2d9b4cc9364ac8e9a15ef74cf62a214175d2876c Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 23 May 2013 00:46:08 +0000 Subject: [PATCH] - Fixed Momir Avatar crash if no cards are found --- .../forge/card/ability/effects/ChooseCardNameEffect.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java b/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java index 24f1aec717d..9c964f52530 100644 --- a/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java +++ b/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java @@ -73,8 +73,12 @@ public class ChooseCardNameEffect extends SpellAbilityEffect { List cards = Lists.newArrayList(CardDb.instance().getUniqueCards()); Predicate cpp = Predicates.and(Predicates.compose(baseRule, CardPrinted.FN_GET_RULES), Predicates.compose(additionalRule, CardPrinted.FN_GET_RULES)); - cards = Lists.newArrayList(Iterables.filter(cards, cpp)); - host.setNamedCard(Aggregates.random(cards).getName()); + cards = Lists.newArrayList(Iterables.filter(cards, cpp)); + if (!cards.isEmpty()) { + host.setNamedCard(Aggregates.random(cards).getName()); + } else { + host.setNamedCard(""); + } ok = true; } else if (p.isHuman()) { final String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card.";