From c58e4d30b3a25e36da67cbdf0fbf68a7c3e6f83f Mon Sep 17 00:00:00 2001 From: friarsol Date: Sun, 6 Sep 2020 22:08:59 -0400 Subject: [PATCH] Better way to handle AllCreatureTypes --- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 2af81451507..f8014d61432 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1206,9 +1206,10 @@ public class CardFactoryUtil { // Figure out how to count each class separately. for (Card card : adventurers) { Set creatureTypes = card.getType().getCreatureTypes(); + boolean anyType = creatureTypes.contains("AllCreatureTypes"); creatureTypes.retainAll(partyTypes); - if (creatureTypes.size() == 4 || card.hasKeyword("Changeling")) { + if (anyType || creatureTypes.size() == 4) { wildcard.add(card); if (wildcard.size() >= 4) {