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

- Fixed Momir Avatar crash if no cards are found

Browse Source
This commit is contained in:
Sol
2013-05-23 00:46:08 +00:00
parent 65c77759db
commit 2d9b4cc936
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java
View File

@@ -73,8 +73,12 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
List<CardPrinted> cards = Lists.newArrayList(CardDb.instance().getUniqueCards());
Predicate<CardPrinted> 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.";