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

Merge branch 'newBranch' into 'master'

Browse Source 
Fix NPE

Closes #1164

See merge request core-developers/forge!2169
This commit is contained in:
Hans Mackowiak
2019-09-24 12:11:17 +00:00
parent 829eae7c97 bc5e5a731d
commit d71d63ade8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -511,7 +511,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
int abiX = cardXOffset + (cardWidth / 2) + (cardWidth / 3);
int abiSpace = (cardWidth / 7);
int abiY = cardWidth < 200 ? cardYOffset + 25 : cardYOffset + 50;
if (card.getZone().equals(ZoneType.Battlefield)){
if (ZoneType.Battlefield.equals(card.getZone())){
if (card.getCurrentState().hasFlying()) {
CardFaceSymbols.drawAbilitySymbol("flying", g, abiX, abiY, abiScale, abiScale);
abiY += abiSpace;

2
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@@ -544,7 +544,7 @@ public class CardRenderer {
g.drawRect(BORDER_THICKNESS, Color.MAGENTA, cx, cy, cw, ch);
}
//Ability Icons
boolean onbattlefield = card.getZone().equals(ZoneType.Battlefield);
boolean onbattlefield = ZoneType.Battlefield.equals(card.getZone());
float abiY = cy;
float abiX = cx + ((cw*2)/2.3f);
float abiScale = cw / 5.5f;