From dda73f304e26c76c9de32f8af27c10e3b4382289 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 29 Dec 2014 15:05:01 +0100 Subject: [PATCH] * Fixed possible null pointer exception for add land dialog. --- Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java index 24802e4eccb..5f8e3d28d2e 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java @@ -66,7 +66,7 @@ public class AddLandDialog extends MageDialog { // decide from which sets basic lands are taken from for (String setCode :deck.getExpansionSetCodes()) { ExpansionInfo expansionInfo = ExpansionRepository.instance.getSetByCode(setCode); - if (expansionInfo.hasBasicLands()) { + if (expansionInfo != null && expansionInfo.hasBasicLands()) { this.setCodesland.add(expansionInfo.getCode()); } }