Skip to content

Commit

Permalink
Added null checks when parsing creatures and players in config
Browse files Browse the repository at this point in the history
  • Loading branch information
brad811 committed May 21, 2011
1 parent b996455 commit e97fcbc
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
2 changes: 1 addition & 1 deletion plugin.yml
@@ -1,6 +1,6 @@
name: bZone
main: com.bradsproject.BradleyJewell.bZone.bZone
version: 1.1
version: 1.1.1
description: Control independent zones of your world!
authors:
- Brad811
Expand Down
Expand Up @@ -139,15 +139,21 @@ public void parseConfig()
wild.hurting = Boolean.parseBoolean(value.get("hurting").toString());

List<String> playersNode = (List<String>) value.get("players");
for(String player : playersNode)
if(playersNode != null)
{
wild.players.add(player);
for(String player : playersNode)
{
wild.players.add(player);
}
}

List<String> monstersNode = (List<String>) value.get("creatures");
for(String monster : monstersNode)
if(monstersNode != null)
{
wild.creatures.add(monster);
for(String monster : monstersNode)
{
wild.creatures.add(monster);
}
}

Map<String,Object> protectionNode = (Map<String,Object>) value.get("protection");
Expand Down Expand Up @@ -179,15 +185,21 @@ public void parseConfig()
zone.healing = Boolean.parseBoolean(value.get("healing").toString());

List<String> playersNode = (List<String>) value.get("players");
for(String player : playersNode)
if(playersNode != null)
{
zone.players.add(player);
for(String player : playersNode)
{
zone.players.add(player);
}
}

List<String> monstersNode = (List<String>) value.get("creatures");
for(String monster : monstersNode)
if(monstersNode != null)
{
zone.creatures.add(monster);
for(String monster : monstersNode)
{
zone.creatures.add(monster);
}
}

Map<String,Object> protectionNode = (Map<String,Object>) value.get("protection");
Expand Down

0 comments on commit e97fcbc

Please sign in to comment.