Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Some changes to Morph card image display.

Browse source
This commit is contained in:
LevelX2 2014-09-16 07:53:00 +02:00
parent 30d112e0bf
commit c3fba626a2
3 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
View file

@ -1,5 +1,7 @@
package org.mage.plugins.card.images;
import java.util.Objects;
/**
*
* @author North
@ -68,7 +70,7 @@ public class CardDownloadData {
if ((this.set == null) ? (other.set != null) : !this.set.equals(other.set)) {
return false;
}
if (this.collectorId != other.collectorId && (this.collectorId == null || !this.collectorId.equals(other.collectorId))) {
if (!Objects.equals(this.collectorId, other.collectorId) && (this.collectorId == null || !this.collectorId.equals(other.collectorId))) {
return false;
}
if (this.token != other.token) {

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

@ -130,7 +130,15 @@ public class ImageCache {
}
});
}
public static BufferedImage getMorphImage() {
CardDownloadData info = new CardDownloadData("Morph", "KTK", 0, false, 0, "KTK");
info.setToken(true);
String path = CardImageUtils.generateTokenImagePath(info);
TFile file = new TFile(path);
return loadImage(file);
}
private static String buildThumbnailPath(String path) {
String thumbnailPath;
if (PreferencesDialog.isSaveImagesToZip()) {