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

- A better fix for the custom booster draft NPEing

Browse Source
This commit is contained in:
Agetian
2014-01-27 07:06:20 +00:00
parent f5d43d0986
commit 8dea53bcda
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,10 @@ public class ImageCache {
* </p> * </p>
*/ */
public static BufferedImage getOriginalImage(String imageKey, boolean useDefaultIfNotFound) { public static BufferedImage getOriginalImage(String imageKey, boolean useDefaultIfNotFound) {
if (null == imageKey) {
return 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());

4
forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java
View File

@@ -45,6 +45,10 @@ public enum CDetail implements ICDoc {
* @param c &emsp; Card object * @param c &emsp; Card object
*/ */
public void showCard(final Card c) { public void showCard(final Card c) {
if (null == c) {
return;
}
view.getLblFlipcard().setVisible(c != null && (c.isDoubleFaced() || c.isFlipCard() || c.isFaceDown() && Singletons.getControl().mayShowCard(c))); view.getLblFlipcard().setVisible(c != null && (c.isDoubleFaced() || c.isFlipCard() || c.isFaceDown() && Singletons.getControl().mayShowCard(c)));
view.getPnlDetail().setCard(c); view.getPnlDetail().setCard(c);
view.getParentCell().repaintSelf(); view.getParentCell().repaintSelf();