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

Merge branch 'custom-crash' into 'master'

Browse Source 
Prevent crash in custom card loading

See merge request core-developers/forge!4236
This commit is contained in:
Anthony Calosa
2021-03-20 23:20:47 +00:00
parent 8643503082 6715c53b73
commit 3f37a51eeb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-core/src/main/java/forge/StaticData.java
View File

@@ -185,7 +185,10 @@ public class StaticData {
CardDb.CardRequest r = CardRequest.fromString(encodedCardName); CardDb.CardRequest r = CardRequest.fromString(encodedCardName);
String cardName = r.cardName; String cardName = r.cardName;
CardRules rules = cardReader.attemptToLoadCard(cardName, setCode); 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 != null) {
if (rules.isVariant()) { if (rules.isVariant()) {
variantCards.loadCard(cardName, rules); variantCards.loadCard(cardName, rules);