From 1c6b256268ea07d44bd0b534adc7d435abf19f8d Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Sun, 13 Jul 2025 18:39:06 +0000
Subject: [PATCH] Fix Spacecraft type collision (#8024)

---
 .../src/main/java/forge/card/CardType.java    | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index 54b00c0fbdb..84d9edc49d3 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -659,33 +659,36 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
         if (subtypes.isEmpty()) {
             return;
         }
-        if (!isCreature() && !isKindred()) {
-            subtypes.removeIf(Predicates.IS_CREATURE_TYPE);
+        Predicate<String> allowedTypes = x -> false;
+        if (isCreature() || isKindred()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_CREATURE_TYPE);
         }
-        if (!isLand()) {
-            subtypes.removeIf(Predicates.IS_LAND_TYPE);
+        if (isLand()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_LAND_TYPE);
         }
-        if (!isArtifact()) {
-            subtypes.removeIf(Predicates.IS_ARTIFACT_TYPE);
+        if (isArtifact()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_ARTIFACT_TYPE);
         }
-        if (!isEnchantment()) {
-            subtypes.removeIf(Predicates.IS_ENCHANTMENT_TYPE);
+        if (isEnchantment()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_ENCHANTMENT_TYPE);
         }
-        if (!isInstant() && !isSorcery()) {
-            subtypes.removeIf(Predicates.IS_SPELL_TYPE);
+        if (isInstant() || isSorcery()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_SPELL_TYPE);
         }
-        if (!isPlaneswalker()) {
-            subtypes.removeIf(Predicates.IS_WALKER_TYPE);
+        if (isPlaneswalker()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_WALKER_TYPE);
         }
-        if (!isDungeon()) {
-            subtypes.removeIf(Predicates.IS_DUNGEON_TYPE);
+        if (isDungeon()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_DUNGEON_TYPE);
         }
-        if (!isBattle()) {
-            subtypes.removeIf(Predicates.IS_BATTLE_TYPE);
+        if (isBattle()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_BATTLE_TYPE);
         }
-        if (!isPlane()) {
-            subtypes.removeIf(Predicates.IS_PLANAR_TYPE);
+        if (isPlane()) {
+            allowedTypes = allowedTypes.or(Predicates.IS_PLANAR_TYPE);
         }
+
+        subtypes.removeIf(allowedTypes.negate());
     }
 
     @Override