External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed card rendering breaking when view is missing set code. Real issue is #2260, but that will take more work to fix.

Browse source
This commit is contained in:
Mark Langen 2016-09-12 23:23:23 -06:00
parent 628b1a6573
commit 610c4789e5
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java
View file

@ -63,7 +63,19 @@ public class CardPanelRenderImpl extends CardPanel {
if (!a.getRules().equals(b.getRules())) { if (!a.getRules().equals(b.getRules())) {
return false; return false;
} }
if (!a.getExpansionSetCode().equals(b.getExpansionSetCode())) {
// Expansion set code, with null checking:
// TODO: The null checks should not be necessary, but thanks to Issue #2260
// some tokens / commandobjects will be missing expansion set codes.
String expA = a.getExpansionSetCode();
if (expA == null) {
expA = "";
}
String expB = b.getExpansionSetCode();
if (expB == null) {
expB = "";
}
if (!expA.equals(expB)) {
return false; return false;
} }
if (a.getFrameStyle() != b.getFrameStyle()) { if (a.getFrameStyle() != b.getFrameStyle()) {