External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increased performance function for finding a card in DB with a specific set. Cube from deck (custom cube) now respects chosen set for a given card.

Browse source
This commit is contained in:
spjspj 2017-04-18 20:58:03 +10:00
parent d55c82adf4
commit 8c46f23e02
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeFromDeck.java
View file

@ -49,7 +49,7 @@ public class CubeFromDeck extends DraftCube {
if (cards != null) { if (cards != null) {
for (DeckCardInfo card : cards.getCards()) { for (DeckCardInfo card : cards.getCards()) {
cubeCards.add(new CardIdentity(card.getCardName(), "")); cubeCards.add(new CardIdentity(card.getCardName(), card.getSetCode()));
} }
} }
} }

18
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -420,6 +420,24 @@ public enum CardRepository {
return null; return null;
} }
public CardInfo findCardWPreferredSet(String name, String expansion, boolean caseInsensitive) {
List<CardInfo> cards;
if (caseInsensitive) {
cards = findCardsCaseInsensitive(name);
} else {
cards = findCards(name);
}
if (!cards.isEmpty()) {
CardInfo cardToUse = null;
for (CardInfo cardinfo : cards) {
if (cardinfo.getSetCode() != null && expansion != null && expansion.equalsIgnoreCase(cardinfo.getSetCode())) {
return cardinfo;
}
}
}
return findPreferedCoreExpansionCard(name, true);
}
public List<CardInfo> findCards(String name) { public List<CardInfo> findCards(String name) {
try { try {
QueryBuilder<CardInfo, Object> queryBuilder = cardDao.queryBuilder(); QueryBuilder<CardInfo, Object> queryBuilder = cardDao.queryBuilder();

6
Mage/src/main/java/mage/game/draft/DraftCube.java
View file

@ -107,11 +107,7 @@ public abstract class DraftCube {
if (!cardId.getName().isEmpty()) { if (!cardId.getName().isEmpty()) {
CardInfo cardInfo = null; CardInfo cardInfo = null;
if (!cardId.getExtension().isEmpty()) { if (!cardId.getExtension().isEmpty()) {
CardCriteria criteria = new CardCriteria().name(cardId.getName()).setCodes(cardId.extension); cardInfo = CardRepository.instance.findCardWPreferredSet(cardId.getName(), cardId.getExtension(), false);
List<CardInfo> cardList = CardRepository.instance.findCards(criteria);
if (cardList != null && !cardList.isEmpty()) {
cardInfo = cardList.get(0);
}
} else { } else {
cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(cardId.getName(), false); cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(cardId.getName(), false);
} }