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

*Fix potential NPE in Commander deck conformance check.

Browse Source
This commit is contained in:
Hellfish
2013-04-23 18:43:19 +00:00
parent f5ac535af3
commit deeba62794
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/forge/deck/DeckFormat.java
View File

@@ -170,20 +170,23 @@ public enum DeckFormat {
} }
} }
} }
for(Entry<CardPrinted, Integer> cp : deck.get(DeckSection.Sideboard)) { if(deck.get(DeckSection.Sideboard) != null)
if(!cp.getKey().getRules().getColorIdentity().hasNoColorsExcept(cmdCI.getColor())) {
{ for(Entry<CardPrinted, Integer> cp : deck.get(DeckSection.Sideboard)) {
erroneousCI.add(cp.getKey()); if(!cp.getKey().getRules().getColorIdentity().hasNoColorsExcept(cmdCI.getColor()))
}
if(cp.getKey().getRules().getType().isLand())
{
for(String key : Constant.Color.COLOR_TO_BASIC_LAND_TYPE_MAP.keySet())
{ {
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());
}
} }
} }
} }