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

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
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())) {
return false;
}
if (!a.getCardNumber().equals(b.getCardNumber())) {
if (a.getCardNumber() != null && !a.getCardNumber().equals(b.getCardNumber())) {
return false;
}
// 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 {
boolean usesVariousArt = false;
LOGGER.info("Key load to CACHE: " + key);
if (key.matches(".*#usesVariousArt.*")) {
usesVariousArt = true;
key = key.replace("#usesVariousArt", "");
@ -130,9 +129,7 @@ public class ImageCache {
}
} else {
BufferedImage image = loadImage(file);
LOGGER.info("Basic image: @" + Integer.toHexString(image.hashCode()));
image = getWizardsCard(image);
LOGGER.info("Wizard image: @" + Integer.toHexString(image.hashCode()));
return image;
}
} else {