From 6715c53b73f9b1b435ea44646d485fff2de40360 Mon Sep 17 00:00:00 2001 From: Adam Pantel <> Date: Sat, 20 Mar 2021 15:37:07 -0400 Subject: [PATCH] Prevent crash in custom card loading --- forge-core/src/main/java/forge/StaticData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index 19b919df9d9..3d7717802c5 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -185,7 +185,10 @@ public class StaticData { CardDb.CardRequest r = CardRequest.fromString(encodedCardName); String cardName = r.cardName; CardRules rules = cardReader.attemptToLoadCard(cardName, setCode); - CardRules customRules = customCardReader.attemptToLoadCard(cardName, setCode); + CardRules customRules = null; + if (customCardReader != null) { + customRules = customCardReader.attemptToLoadCard(cardName, setCode); + } if (rules != null) { if (rules.isVariant()) { variantCards.loadCard(cardName, rules);