mirror of
https://github.com/correl/mage.git
synced 2024-12-24 11:50:45 +00:00
Mage 1.4.26V11
This commit is contained in:
parent
8afcc63b84
commit
46bcad2ada
2 changed files with 3 additions and 4 deletions
|
@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
|
|||
public final static int MAGE_VERSION_MAJOR = 1;
|
||||
public final static int MAGE_VERSION_MINOR = 4;
|
||||
public final static int MAGE_VERSION_PATCH = 26;
|
||||
public final static String MAGE_VERSION_MINOR_PATCH = "V10";
|
||||
public final static String MAGE_VERSION_MINOR_PATCH = "V11";
|
||||
public final static String MAGE_VERSION_INFO = "";
|
||||
|
||||
private final int major;
|
||||
|
|
|
@ -58,7 +58,7 @@ public enum CardRepository {
|
|||
// raise this if db structure was changed
|
||||
private static final long CARD_DB_VERSION = 51;
|
||||
// raise this if new cards were added to the server
|
||||
private static final long CARD_CONTENT_VERSION = 97;
|
||||
private static final long CARD_CONTENT_VERSION = 98;
|
||||
private Dao<CardInfo, Object> cardDao;
|
||||
private Set<String> classNames;
|
||||
|
||||
|
@ -330,7 +330,6 @@ public enum CardRepository {
|
|||
return findPreferedCoreExpansionCard(name, caseInsensitive, null);
|
||||
}
|
||||
|
||||
|
||||
public CardInfo findPreferedCoreExpansionCard(String name, boolean caseInsensitive, String preferedSetCode) {
|
||||
|
||||
List<CardInfo> cards;
|
||||
|
@ -348,7 +347,7 @@ public enum CardRepository {
|
|||
ExpansionInfo set = ExpansionRepository.instance.getSetByCode(cardinfo.getSetCode());
|
||||
if (set != null) {
|
||||
|
||||
if ((preferedSetCode != null) && (preferedSetCode.equals(set.getCode()))){
|
||||
if ((preferedSetCode != null) && (preferedSetCode.equals(set.getCode()))) {
|
||||
return cardinfo;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue