From 02fcc0efb5151421d98d7b1fc2496b1cf3b360d0 Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Wed, 15 Sep 2021 20:07:47 +0100 Subject: [PATCH] FIX incorporating tokenKey with tokenSection if Any (tokenSection is null for non-legal-card-type token) Signed-off-by: leriomaggio --- .../main/java/forge/deck/DeckRecognizer.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index 14af71e883a..db282c33d58 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -149,12 +149,19 @@ public class DeckRecognizer { } public String getKey(){ - if (this.isCardToken()) - return String.format("%s-%s-%s-%s-%s", + if (this.isCardToken()) { + if (this.tokenSection != null) + return String.format("%s-%s-%s-%s-%s", + this.card.getName(), this.card.getEdition(), + this.card.getCollectorNumber(), + this.getType().name().toLowerCase(), + this.tokenSection.name()); + return String.format("%s-%s-%s-%s", this.card.getName(), this.card.getEdition(), this.card.getCollectorNumber(), - this.tokenSection.name(), this.getType().name().toLowerCase()); - return ""; + this.getType().name().toLowerCase()); + } + return null; } public static class TokenKey { @@ -171,8 +178,11 @@ public class DeckRecognizer { tokenKey.cardName = keyInfo[0]; tokenKey.setCode = keyInfo[1]; tokenKey.collectorNumber = keyInfo[2]; - tokenKey.deckSection = keyInfo[3]; - tokenKey.typeName = keyInfo[4]; + tokenKey.typeName = keyInfo[3]; + if (keyInfo.length > 4) + tokenKey.deckSection = keyInfo[3]; + else + tokenKey.deckSection = null; return tokenKey; } }