External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

other: fixed miss null checks in frame style usage (close #13662)

Browse source
This commit is contained in:
Oleg Agafonov 2025-05-24 17:37:20 +04:00
parent 1f75b36898
commit 11dcc18049
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderModeMTGO.java
View file

@ -84,7 +84,7 @@ public class CardPanelRenderModeMTGO extends CardPanel {
sb.append((char) (this.view.isCanAttack() ? 1 : 0)); sb.append((char) (this.view.isCanAttack() ? 1 : 0));
sb.append((char) (this.view.isCanBlock() ? 1 : 0)); sb.append((char) (this.view.isCanBlock() ? 1 : 0));
sb.append((char) (this.view.isFaceDown() ? 1 : 0)); sb.append((char) (this.view.isFaceDown() ? 1 : 0));
sb.append((char) this.view.getFrameStyle().ordinal()); sb.append((char) (this.view.getFrameStyle() != null ? this.view.getFrameStyle().ordinal() : -1));
if (this.view instanceof PermanentView) { if (this.view instanceof PermanentView) {
sb.append((char) (((PermanentView) this.view).hasSummoningSickness() ? 1 : 0)); sb.append((char) (((PermanentView) this.view).hasSummoningSickness() ? 1 : 0));
sb.append((char) (((PermanentView) this.view).getDamage())); sb.append((char) (((PermanentView) this.view).getDamage()));

4
Mage/src/main/java/mage/cards/repository/CardInfo.java
View file

@ -167,7 +167,9 @@ public class CardInfo {
this.modalDoubleFacedSecondSideName = ((ModalDoubleFacedCard) card).getRightHalfCard().getName(); this.modalDoubleFacedSecondSideName = ((ModalDoubleFacedCard) card).getRightHalfCard().getName();
} }
this.frameStyle = card.getFrameStyle().toString(); if (card.getFrameStyle() != null) {
this.frameStyle = card.getFrameStyle().toString();
}
this.frameColor = card.getFrameColor(null).toString(); this.frameColor = card.getFrameColor(null).toString();
this.variousArt = card.getUsesVariousArt(); this.variousArt = card.getUsesVariousArt();
this.blue = card.getColor(null).isBlue(); this.blue = card.getColor(null).isBlue();