From 797e9a3b66749d4269f49e13e82845b3d100b29c Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sat, 19 Feb 2022 20:18:13 +0100 Subject: [PATCH] DeckHints: extend Type --- forge-core/src/main/java/forge/card/DeckHints.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/forge-core/src/main/java/forge/card/DeckHints.java b/forge-core/src/main/java/forge/card/DeckHints.java index b7d7c96d4ac..a9499445681 100644 --- a/forge-core/src/main/java/forge/card/DeckHints.java +++ b/forge-core/src/main/java/forge/card/DeckHints.java @@ -176,7 +176,14 @@ public class DeckHints { case TYPE: String[] types = param.split("\\|"); for (String t : types) { - Iterables.addAll(cards, getMatchingItems(cardList, CardRulesPredicates.subType(t), PaperCard.FN_GET_RULES)); + Predicate op; + if (t.contains(".")) { + String[] typeParts = t.split("\\."); + op = Predicates.and(CardRulesPredicates.coreType(true, typeParts[0]), CardRulesPredicates.subType(typeParts[1])); + } else { + op = Predicates.or(CardRulesPredicates.coreType(true, t), CardRulesPredicates.subType(t)); + } + Iterables.addAll(cards, getMatchingItems(cardList, op, PaperCard.FN_GET_RULES)); } break; case NONE: