From 87257f04137de1abb467c6c9b3352f6e692400bc Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Wed, 9 Jun 2021 17:44:07 +0100 Subject: [PATCH] Using IPaperCard constants for ArtIndex instead of hard coded values when adding cards to pool --- forge-core/src/main/java/forge/deck/CardPool.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index f80403c2b66..d916e75281f 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -86,17 +86,17 @@ public class CardPool extends ItemPool { } } - int artCount = 1; + int artCount = IPaperCard.DEFAULT_ART_INDEX; if (paperCard != null) { setCode = paperCard.getEdition(); cardName = paperCard.getName(); - artCount = isCommonCard ? StaticData.instance().getCommonCards().getArtCount(cardName, setCode) : 1; + artCount = isCommonCard ? StaticData.instance().getCommonCards().getArtCount(cardName, setCode) : IPaperCard.DEFAULT_ART_INDEX; } else { System.err.print("An unsupported card was requested: \"" + cardName + "\" from \"" + setCode + "\". "); paperCard = StaticData.instance().getCommonCards().createUnsupportedCard(cardName); } - boolean artIndexExplicitlySet = artIndex > 0 || Character.isDigit(cardName.charAt(cardName.length() - 1)) && cardName.charAt(cardName.length() - 2) == CardDb.NameSetSeparator; + boolean artIndexExplicitlySet = artIndex > IPaperCard.NO_ART_INDEX || Character.isDigit(cardName.charAt(cardName.length() - 1)) && cardName.charAt(cardName.length() - 2) == CardDb.NameSetSeparator; if (artIndexExplicitlySet || artCount <= 1) { // either a specific art index is specified, or there is only one art, so just add the card