External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8251 from fearphage/preferred-has-3-rs

Browse source 
corrected typo: prefered -> preferred
This commit is contained in:
Oleg Agafonov 2021-09-11 19:24:38 +04:00 • committed by GitHub
commit b6f9d57216
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/cards/Sets.java
View file

@ -199,10 +199,10 @@ public class Sets extends HashMap<String, ExpansionSet> {
return null;
}
public static ExpansionSet.SetCardInfo findCardByClass(Class<?> clazz, String preferedSetCode) {
public static ExpansionSet.SetCardInfo findCardByClass(Class<?> clazz, String preferredSetCode) {
ExpansionSet.SetCardInfo info = null;
if (instance.containsKey(preferedSetCode)) {
info = instance.get(preferedSetCode).findCardInfoByClass(clazz).stream().findFirst().orElse(null);
if (instance.containsKey(preferredSetCode)) {
info = instance.get(preferredSetCode).findCardInfoByClass(clazz).stream().findFirst().orElse(null);
}
if (info == null) {

2
Mage/src/main/java/mage/cards/decks/importer/CardLookup.java
View file

@ -12,7 +12,7 @@ public class CardLookup {
public static final CardLookup instance = new CardLookup();
public Optional<CardInfo> lookupCardInfo(String name) {
return Optional.ofNullable(CardRepository.instance.findPreferedCoreExpansionCard(name, true));
return Optional.ofNullable(CardRepository.instance.findPreferredCoreExpansionCard(name, true));
}
public List<CardInfo> lookupCardInfo(CardCriteria criteria) {

2
Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java
View file

@ -92,7 +92,7 @@ public class DckDeckImporter extends PlainTextDeckImporter {
}
if (!cardName.equals("")) {
foundedCard = CardRepository.instance.findPreferedCoreExpansionCard(cardName, false, setCode);
foundedCard = CardRepository.instance.findPreferredCoreExpansionCard(cardName, false, setCode);
}
if (foundedCard != null) {

2
Mage/src/main/java/mage/cards/decks/importer/DekDeckImporter.java
View file

@ -21,7 +21,7 @@ public class DekDeckImporter extends PlainTextDeckImporter {
Integer cardCount = Integer.parseInt(extractAttribute(line, "Quantity"));
String cardName = extractAttribute(line, "Name");
boolean isSideboard = "true".equals(extractAttribute(line, "Sideboard"));
CardInfo cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(cardName, true);
CardInfo cardInfo = CardRepository.instance.findPreferredCoreExpansionCard(cardName, true);
if (cardInfo == null) {
sbMessage.append("Could not find card: '").append(cardName).append("' at line ").append(lineCount).append('\n');
} else {

2
Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java
View file

@ -126,7 +126,7 @@ public class TxtDeckImporter extends PlainTextDeckImporter {
wasCardLines = true;
CardInfo cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(lineName, true);
CardInfo cardInfo = CardRepository.instance.findPreferredCoreExpansionCard(lineName, true);
if (cardInfo == null) {
sbMessage.append("Could not find card: '").append(lineName).append("' at line ").append(lineCount).append('\n');
} else {

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

@ -381,26 +381,26 @@ public enum CardRepository {
return null;
}
public CardInfo findPreferedCoreExpansionCard(String name, boolean caseInsensitive) {
return findPreferedCoreExpansionCard(name, caseInsensitive, null);
public CardInfo findPreferredCoreExpansionCard(String name, boolean caseInsensitive) {
return findPreferredCoreExpansionCard(name, caseInsensitive, null);
}
public CardInfo findPreferedCoreExpansionCard(String name, boolean caseInsensitive, String preferedSetCode) {
public CardInfo findPreferredCoreExpansionCard(String name, boolean caseInsensitive, String preferredSetCode) {
List<CardInfo> cards;
if (caseInsensitive) {
cards = findCardsCaseInsensitive(name);
} else {
cards = findCards(name);
}
return findPreferedOrLatestCard(cards, preferedSetCode);
return findPreferredOrLatestCard(cards, preferredSetCode);
}
public CardInfo findPreferedCoreExpansionCardByClassName(String canonicalClassName, String preferedSetCode) {
public CardInfo findPreferredCoreExpansionCardByClassName(String canonicalClassName, String preferredSetCode) {
List<CardInfo> cards = findCardsByClass(canonicalClassName);
return findPreferedOrLatestCard(cards, preferedSetCode);
return findPreferredOrLatestCard(cards, preferredSetCode);
}
private CardInfo findPreferedOrLatestCard(List<CardInfo> cards, String preferedSetCode) {
private CardInfo findPreferredOrLatestCard(List<CardInfo> cards, String preferredSetCode) {
if (!cards.isEmpty()) {
Date lastReleaseDate = null;
Date lastExpansionDate = null;
@ -409,7 +409,7 @@ public enum CardRepository {
ExpansionInfo set = ExpansionRepository.instance.getSetByCode(cardinfo.getSetCode());
if (set != null) {
if ((preferedSetCode != null) && (preferedSetCode.equals(set.getCode()))) {
if ((preferredSetCode != null) && (preferredSetCode.equals(set.getCode()))) {
return cardinfo;
}
@ -443,7 +443,7 @@ public enum CardRepository {
}
}
}
return findPreferedCoreExpansionCard(name, true);
return findPreferredCoreExpansionCard(name, true);
}
public List<CardInfo> findCards(String name) {

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

@ -86,7 +86,7 @@ public abstract class DraftCube {
if (!cardId.getExtension().isEmpty()) {
cardInfo = CardRepository.instance.findCardWPreferredSet(cardId.getName(), cardId.getExtension(), false);
} else {
cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(cardId.getName(), false);
cardInfo = CardRepository.instance.findPreferredCoreExpansionCard(cardId.getName(), false);
}
if (cardInfo != null) {