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

prevent NPE

Browse Source
This commit is contained in:
Anthony Calosa
2022-08-15 08:25:15 +08:00
parent af1a05df45
commit 1f9d212dfd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-mobile/src/forge/card/CardImageRenderer.java
View File

@@ -243,7 +243,7 @@ public class CardImageRenderer {
float padding = h / 8; float padding = h / 8;
float manaCostWidth = 0; float manaCostWidth = 0;
float manaSymbolSize = isAdventure ? MANA_SYMBOL_SIZE * 0.75f : MANA_SYMBOL_SIZE; float manaSymbolSize = isAdventure ? MANA_SYMBOL_SIZE * 0.75f : MANA_SYMBOL_SIZE;
if (!noText) { if (!noText && state != null) {
//draw mana cost for card //draw mana cost for card
ManaCost mainManaCost = state.getManaCost(); ManaCost mainManaCost = state.getManaCost();
if (card.isSplitCard() && card.getAlternateState() != null) { if (card.isSplitCard() && card.getAlternateState() != null) {
@@ -263,7 +263,7 @@ public class CardImageRenderer {
//draw name for card //draw name for card
x += padding; x += padding;
w -= 2 * padding; w -= 2 * padding;
if (!noText) if (!noText && state != null)
g.drawText(CardTranslation.getTranslatedName(state.getName()), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, Align.left, true); g.drawText(CardTranslation.getTranslatedName(state.getName()), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, Align.left, true);
} }
@@ -415,7 +415,7 @@ public class CardImageRenderer {
float padding = h / 8; float padding = h / 8;
//draw square icon for rarity //draw square icon for rarity
if (!noRarity) { if (!noRarity && state != null) {
float iconSize = h * 0.9f; float iconSize = h * 0.9f;
float iconPadding = (h - iconSize) / 2; float iconPadding = (h - iconSize) / 2;
w -= iconSize + iconPadding * 2; w -= iconSize + iconPadding * 2;
@@ -439,7 +439,8 @@ public class CardImageRenderer {
if (noText) if (noText)
return; return;
x += padding; x += padding;
g.drawText(CardDetailUtil.formatCardType(state, canShow), TYPE_FONT, Color.BLACK, x, y, w, h, false, Align.left, true); if (state != null)
g.drawText(CardDetailUtil.formatCardType(state, canShow), TYPE_FONT, Color.BLACK, x, y, w, h, false, Align.left, true);
} }
//use text renderer to handle mana symbols and reminder text //use text renderer to handle mana symbols and reminder text