From ae455edf9ffd6c16a1c44de2b9f5ba508b5c9ca1 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Sat, 8 Apr 2023 18:41:40 +0200
Subject: [PATCH] CardType: sanisfy Battle types

---
 forge-core/src/main/java/forge/card/CardType.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index cd7c001ecf0..e7cef7d06b2 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -619,6 +619,9 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
         if (!isDungeon()) {
             Iterables.removeIf(subtypes, Predicates.IS_DUNGEON_TYPE);
         }
+        if (!isBattle()) {
+            Iterables.removeIf(subtypes, Predicates.IS_BATTLE_TYPE);
+        }
     }
 
     @Override
@@ -857,6 +860,12 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
                 return CardType.isADungeonType(input);
             }
         };
+        public static Predicate<String> IS_BATTLE_TYPE = new Predicate<String>() {
+            @Override
+            public boolean apply(String input) {
+                return CardType.isABattleType(input);
+            }
+        };
     }
 
     ///////// Utility methods
@@ -890,6 +899,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
             sortedSubTypes.addAll(Constant.ARTIFACT_TYPES);
             sortedSubTypes.addAll(Constant.WALKER_TYPES);
             sortedSubTypes.addAll(Constant.DUNGEON_TYPES);
+            sortedSubTypes.addAll(Constant.BATTLE_TYPES);
             Collections.sort(sortedSubTypes);
         }
         return sortedSubTypes;