From 37f3fad409b5fa6815ff8e7345b39e98da08c3b3 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 17 May 2015 14:59:31 +0000 Subject: [PATCH] - Make looking up cards by equivalent name more efficient. --- forge-core/src/main/java/forge/deck/CardPool.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index 129688dee35..3441989c861 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -63,18 +63,18 @@ public class CardPool extends ItemPool { // NOTE: ART indices are "1" -based public void add(String cardName, String setCode, final int artIndex, final int amount) { PaperCard cp = StaticData.instance().getCommonCards().getCard(cardName, setCode, artIndex); - if (cp == null) { + String equivName = StaticData.instance().getCommonCards().getEquivalentCardName(cardName); + + if (cp == null && !cardName.equals(equivName)) { // try the equivalent card name - String equivName = StaticData.instance().getCommonCards().getEquivalentCardName(cardName); cp = StaticData.instance().getCommonCards().getCard(equivName, setCode, artIndex); } boolean isCommonCard = cp != null; if (!isCommonCard) { cp = StaticData.instance().getVariantCards().getCard(cardName, setCode); - if (cp == null) { + if (cp == null && !cardName.equals(equivName)) { // try the equivalent card name - String equivName = StaticData.instance().getVariantCards().getEquivalentCardName(cardName); cp = StaticData.instance().getVariantCards().getCard(equivName, setCode, artIndex); } }