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

Fix crash with The Monarch

Browse Source
This commit is contained in:
tool4EvEr
2021-07-31 19:21:45 +02:00
parent cb7d8e572c
commit 168cc31955
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/util/ImageUtil.java
View File

@@ -15,7 +15,7 @@ public class ImageUtil {
} }
public static PaperCard getPaperCardFromImageKey(String key) { public static PaperCard getPaperCardFromImageKey(String key) {
if ( key == null ) { if (key == null) {
return null; return null;
} }

4
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -156,7 +156,7 @@ public class ImageCache {
IPaperCard ipc = null; IPaperCard ipc = null;
boolean altState = imageKey.endsWith(ImageKeys.BACKFACE_POSTFIX); boolean altState = imageKey.endsWith(ImageKeys.BACKFACE_POSTFIX);
if(altState) if (altState)
imageKey = imageKey.substring(0, imageKey.length() - ImageKeys.BACKFACE_POSTFIX.length()); imageKey = imageKey.substring(0, imageKey.length() - ImageKeys.BACKFACE_POSTFIX.length());
if (imageKey.startsWith(ImageKeys.CARD_PREFIX)) { if (imageKey.startsWith(ImageKeys.CARD_PREFIX)) {
PaperCard pc = ImageUtil.getPaperCardFromImageKey(imageKey); PaperCard pc = ImageUtil.getPaperCardFromImageKey(imageKey);
@@ -165,7 +165,7 @@ public class ImageCache {
if (StringUtils.isBlank(imageKey)) { if (StringUtils.isBlank(imageKey)) {
return _defaultImage; return _defaultImage;
} }
} else if (imageKey.startsWith(ImageKeys.TOKEN_PREFIX)) { } else if (imageKey.startsWith(ImageKeys.TOKEN_PREFIX) && cardView.isToken()) {
ipc = ImageUtil.getPaperTokenFromImageKey(imageKey); ipc = ImageUtil.getPaperTokenFromImageKey(imageKey);
} }