From c9faba36a96e16091354ec655930f867d1fae1a1 Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Wed, 29 Sep 2021 07:30:55 +0100 Subject: [PATCH] Change to isCardType Matching: from contains to startswith This is to avoid matching things like "island" as a "land" card type token Signed-off-by: leriomaggio --- forge-core/src/main/java/forge/deck/DeckRecognizer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index e82dbc7dd8a..73932eba254 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -640,13 +640,13 @@ public class DeckRecognizer { /* ----------------------------------------------------------------------------- Note: Card types, CMC, and Rarity Tokens are **only** used for style formatting in the Import Editor. This won't affect the import process in any way. - The use of this token has been borrowed by Deckstats.net format export. + The use of these tokens has been borrowed by Deckstats.net format export. ----------------------------------------------------------------------------- */ public static boolean isCardType(final String lineAsIs) { String nonCardToken = nonCardTokenMatch(lineAsIs); if (nonCardToken == null) return false; - return StringUtils.containsAny(nonCardToken.toLowerCase(), CARD_TYPES); + return StringUtils.startsWithAny(nonCardToken.toLowerCase(), CARD_TYPES); } public static boolean isCardRarity(final String lineAsIs){