From b4928378c9f6d790b89e73e20829850f20dcb5e4 Mon Sep 17 00:00:00 2001
From: Meerkov <gomeerkov@gmail.com>
Date: Thu, 22 Jul 2021 09:45:01 +0000
Subject: [PATCH] Fix CARDNAME on 6 cards

Some spell descriptions were not properly using CARDNAME. This is relevant because Mutate, etc.
---
 .../src/main/java/forge/card/CardRulesPredicates.java     | 8 ++++++++
 .../java/forge/gamemodes/limited/LimitedDeckBuilder.java  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/forge-core/src/main/java/forge/card/CardRulesPredicates.java b/forge-core/src/main/java/forge/card/CardRulesPredicates.java
index 560bfbe2e9c..be11a1ee5d3 100644
--- a/forge-core/src/main/java/forge/card/CardRulesPredicates.java
+++ b/forge-core/src/main/java/forge/card/CardRulesPredicates.java
@@ -26,6 +26,14 @@ public final class CardRulesPredicates {
         }
     };
 
+    /** The Constant isKeptInAiLimitedDecks. */
+    public static final Predicate<CardRules> IS_KEPT_IN_AI_LIMITED_DECKS = new Predicate<CardRules>() {
+        @Override
+        public boolean apply(final CardRules card) {
+            return !card.getAiHints().getRemAIDecks() && !card.getAiHints().getRemNonCommanderDecks();
+        }
+    };
+
     /** The Constant isKeptInRandomDecks. */
     public static final Predicate<CardRules> IS_KEPT_IN_RANDOM_DECKS = new Predicate<CardRules>() {
         @Override
diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java
index 65b51fbf674..4e6d4874698 100644
--- a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckBuilder.java
@@ -84,7 +84,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
 
         // remove Unplayables
         final Iterable<PaperCard> playables = Iterables.filter(availableList,
-                Predicates.compose(CardRulesPredicates.IS_KEPT_IN_AI_DECKS, PaperCard.FN_GET_RULES));
+                Predicates.compose(CardRulesPredicates.IS_KEPT_IN_AI_LIMITED_DECKS, PaperCard.FN_GET_RULES));
         this.aiPlayables = Lists.newArrayList(playables);
         this.availableList.removeAll(aiPlayables);