From deeba6279477afb1732c5d38057c3126896ec8e8 Mon Sep 17 00:00:00 2001 From: Hellfish Date: Tue, 23 Apr 2013 18:43:19 +0000 Subject: [PATCH] *Fix potential NPE in Commander deck conformance check. --- src/main/java/forge/deck/DeckFormat.java | 25 +++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/forge/deck/DeckFormat.java b/src/main/java/forge/deck/DeckFormat.java index c00bc421a56..bbe88db00e2 100644 --- a/src/main/java/forge/deck/DeckFormat.java +++ b/src/main/java/forge/deck/DeckFormat.java @@ -170,20 +170,23 @@ public enum DeckFormat { } } } - for(Entry cp : deck.get(DeckSection.Sideboard)) { - if(!cp.getKey().getRules().getColorIdentity().hasNoColorsExcept(cmdCI.getColor())) - { - erroneousCI.add(cp.getKey()); - } - if(cp.getKey().getRules().getType().isLand()) - { - for(String key : Constant.Color.COLOR_TO_BASIC_LAND_TYPE_MAP.keySet()) + if(deck.get(DeckSection.Sideboard) != null) + { + for(Entry cp : deck.get(DeckSection.Sideboard)) { + if(!cp.getKey().getRules().getColorIdentity().hasNoColorsExcept(cmdCI.getColor())) { - if(!cmdCI.hasAnyColor(MagicColor.fromName(key))) + erroneousCI.add(cp.getKey()); + } + if(cp.getKey().getRules().getType().isLand()) + { + for(String key : Constant.Color.COLOR_TO_BASIC_LAND_TYPE_MAP.keySet()) { - if(cp.getKey().getRules().getType().subTypeContains(Constant.Color.COLOR_TO_BASIC_LAND_TYPE_MAP.get(key))) + if(!cmdCI.hasAnyColor(MagicColor.fromName(key))) { - erroneousCI.add(cp.getKey()); + if(cp.getKey().getRules().getType().subTypeContains(Constant.Color.COLOR_TO_BASIC_LAND_TYPE_MAP.get(key))) + { + erroneousCI.add(cp.getKey()); + } } } }