From 610c4789e595e15c030b92f033e94b3412dfea60 Mon Sep 17 00:00:00 2001 From: Mark Langen Date: Mon, 12 Sep 2016 23:23:23 -0600 Subject: [PATCH] Fixed card rendering breaking when view is missing set code. Real issue is #2260, but that will take more work to fix. --- .../org/mage/card/arcane/CardPanelRenderImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java index 97ab5c06d92..11b6599972b 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java @@ -63,7 +63,19 @@ public class CardPanelRenderImpl extends CardPanel { if (!a.getRules().equals(b.getRules())) { 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; } if (a.getFrameStyle() != b.getFrameStyle()) {