* Fixed possible null pointer exception for add land dialog.

This commit is contained in:
LevelX2 2014-12-29 15:06:56 +01:00
parent dda73f304e
commit 64176c1fa6

View file

@ -75,6 +75,7 @@ public class AddLandDialog extends MageDialog {
if (this.setCodesland.isEmpty()) { if (this.setCodesland.isEmpty()) {
for (String setCode :deck.getExpansionSetCodes()) { for (String setCode :deck.getExpansionSetCodes()) {
ExpansionInfo expansionInfo = ExpansionRepository.instance.getSetByCode(setCode); ExpansionInfo expansionInfo = ExpansionRepository.instance.getSetByCode(setCode);
if (expansionInfo != null) {
ExpansionInfo [] blockSets = ExpansionRepository.instance.getSetsFromBlock(expansionInfo.getBlockName()); ExpansionInfo [] blockSets = ExpansionRepository.instance.getSetsFromBlock(expansionInfo.getBlockName());
for (ExpansionInfo blockSet: blockSets) { for (ExpansionInfo blockSet: blockSets) {
if (blockSet.hasBasicLands()) { if (blockSet.hasBasicLands()) {
@ -83,6 +84,7 @@ public class AddLandDialog extends MageDialog {
} }
} }
} }
}
// if still no set with lands found, take one by random // if still no set with lands found, take one by random
if (this.setCodesland.isEmpty()) { if (this.setCodesland.isEmpty()) {
// if sets have no basic lands and also it has no parent or parent has no lands get last set with lands // if sets have no basic lands and also it has no parent or parent has no lands get last set with lands