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

Some fixes to the Monarch designation.

Browse source
This commit is contained in:
LevelX2 2016-12-07 17:14:08 +01:00
parent 02b30a503a
commit 3d95849c10
15 changed files with 511 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,9 @@ public class CardPanelRenderImpl extends CardPanel {
if (!a.getRules().equals(b.getRules())) {
return false;
}
if (a.getRarity() == null || b.getRarity() == null) {
return false;
}
if (!a.getRarity().equals(b.getRarity())) {
return false;
}

6
Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
View file

@ -42,7 +42,7 @@ public class CardImageUtils {
return filePath;
}
}
log.warn("Token image file not found: " + card.getTokenSetCode() + " - " + card.getName());
log.warn("Token image file not found: " + card.getSet() + " - " + card.getTokenSetCode() + " - " + card.getName());
return null;
}
@ -117,7 +117,7 @@ public class CardImageUtils {
return buildPath(imagesDir, set);
}
}
public static String getImageBasePath() {
String useDefault = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_USE_DEFAULT, "true");
String imagesPath = useDefault.equals("true") ? Constants.IO.imageBaseDir : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
@ -126,7 +126,7 @@ public class CardImageUtils {
}
return imagesPath;
}
public static String getTokenBasePath() {
String imagesPath = getImageBasePath();