external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forge will no longer crash when there are decks with unsupported cards. These cards will appear in decks and games player starts as a dummy without cost, types, abilities, but with explanation in card's text

Browse Source
This commit is contained in:
Maxmtg
2014-02-01 21:43:42 +00:00
parent c3d7a9f075
commit 691c52fff9
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui/src/main/java/forge/ImageCache.java
View File

@@ -144,6 +144,9 @@ public class ImageCache {
if (imageKey.startsWith(ImageKeys.CARD_PREFIX))
imageKey = getImageKey(getPaperCardFromImageKey(imageKey.substring(2)), altState, true);
if (StringUtils.isBlank(imageKey)) {
return null;
}
// Load from file and add to cache if not found in cache initially.
BufferedImage original = getImage(imageKey);
@@ -153,7 +156,7 @@ public class ImageCache {
if (original == null) {
if (useDefaultIfNotFound) {
original = _defaultImage;
_CACHE.put(imageKey, _defaultImage);
_CACHE.put(imageKey, _defaultImage);
} else {
original = null;
}
@@ -243,7 +246,7 @@ public class ImageCache {
private static String getImageRelativePath(PaperCard cp, boolean backFace, boolean includeSet, boolean isDownloadUrl) {
final String nameToUse = getNameToUse(cp, backFace);
final String nameToUse = cp == null ? null : getNameToUse(cp, backFace);
if ( null == nameToUse )
return null;