diff --git a/src/main/java/forge/item/CardDb.java b/src/main/java/forge/item/CardDb.java index ef60bbd9a43..b24f0ad3c4e 100644 --- a/src/main/java/forge/item/CardDb.java +++ b/src/main/java/forge/item/CardDb.java @@ -397,7 +397,12 @@ public final class CardDb { // Find card with maximal set index result = Aggregates.itemWithMax(namedCards, CardPrinted.FN_GET_EDITION_INDEX); if (null == result) { - throw new NoSuchElementException(String.format("Card '%s' not found in our database.", name)); + // 2nd chance: look in planes, schemes and so on + final Iterable namedNonTraditionals = Iterables.filter(this.allNonTraditionalCardsFlat, predicate); + result = Aggregates.itemWithMax(namedNonTraditionals, CardPrinted.FN_GET_EDITION_INDEX); + + if ( null == result ) // sure thing, throw exception + throw new NoSuchElementException(String.format("Card '%s' not found in our database.", name)); } }