external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Make looking up cards by equivalent name more efficient.

Browse Source
This commit is contained in:
Agetian
2015-05-17 14:59:31 +00:00
parent 50ba2341d1
commit 37f3fad409
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-core/src/main/java/forge/deck/CardPool.java
View File

@@ -63,18 +63,18 @@ public class CardPool extends ItemPool<PaperCard> {
// NOTE: ART indices are "1" -based // NOTE: ART indices are "1" -based
public void add(String cardName, String setCode, final int artIndex, final int amount) { public void add(String cardName, String setCode, final int artIndex, final int amount) {
PaperCard cp = StaticData.instance().getCommonCards().getCard(cardName, setCode, artIndex); 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 // try the equivalent card name
String equivName = StaticData.instance().getCommonCards().getEquivalentCardName(cardName);
cp = StaticData.instance().getCommonCards().getCard(equivName, setCode, artIndex); cp = StaticData.instance().getCommonCards().getCard(equivName, setCode, artIndex);
} }
boolean isCommonCard = cp != null; boolean isCommonCard = cp != null;
if (!isCommonCard) { if (!isCommonCard) {
cp = StaticData.instance().getVariantCards().getCard(cardName, setCode); cp = StaticData.instance().getVariantCards().getCard(cardName, setCode);
if (cp == null) { if (cp == null && !cardName.equals(equivName)) {
// try the equivalent card name // try the equivalent card name
String equivName = StaticData.instance().getVariantCards().getEquivalentCardName(cardName);
cp = StaticData.instance().getVariantCards().getCard(equivName, setCode, artIndex); cp = StaticData.instance().getVariantCards().getCard(equivName, setCode, artIndex);
} }
} }