github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Xmage 1.4.16v3

Browse source
This commit is contained in:
LevelX2 2016-10-09 15:54:12 +02:00
parent 27acaa5c9a
commit 2e1f8c07cb
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java
View file

@ -66,7 +66,7 @@ public class CardPanelRenderImpl extends CardPanel {
if (!a.getRarity().equals(b.getRarity())) { if (!a.getRarity().equals(b.getRarity())) {
return false; return false;
} }
if (!a.getCardNumber().equals(b.getCardNumber())) { if (a.getCardNumber() != null && !a.getCardNumber().equals(b.getCardNumber())) {
return false; return false;
} }
// Expansion set code, with null checking: // Expansion set code, with null checking:

3
Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
View file

@ -57,7 +57,6 @@ public class ImageCache {
try { try {
boolean usesVariousArt = false; boolean usesVariousArt = false;
LOGGER.info("Key load to CACHE: " + key);
if (key.matches(".*#usesVariousArt.*")) { if (key.matches(".*#usesVariousArt.*")) {
usesVariousArt = true; usesVariousArt = true;
key = key.replace("#usesVariousArt", ""); key = key.replace("#usesVariousArt", "");
@ -130,9 +129,7 @@ public class ImageCache {
} }
} else { } else {
BufferedImage image = loadImage(file); BufferedImage image = loadImage(file);
LOGGER.info("Basic image: @" + Integer.toHexString(image.hashCode()));
image = getWizardsCard(image); image = getWizardsCard(image);
LOGGER.info("Wizard image: @" + Integer.toHexString(image.hashCode()));
return image; return image;
} }
} else { } else {

2
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -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_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 16; public final static int MAGE_VERSION_PATCH = 16;
public final static String MAGE_VERSION_MINOR_PATCH = "v2"; public final static String MAGE_VERSION_MINOR_PATCH = "v3";
public final static String MAGE_VERSION_INFO = ""; public final static String MAGE_VERSION_INFO = "";
private final int major; private final int major;

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

@ -45,7 +45,6 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SetType; import mage.constants.SetType;
@ -65,7 +64,7 @@ public enum CardRepository {
// raise this if db structure was changed // raise this if db structure was changed
private static final long CARD_DB_VERSION = 47; private static final long CARD_DB_VERSION = 47;
// raise this if new cards were added to the server // raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 62; private static final long CARD_CONTENT_VERSION = 63;
private Dao<CardInfo, Object> cardDao; private Dao<CardInfo, Object> cardDao;
private Set<String> classNames; private Set<String> classNames;