From c0479bff055e3646d5f7d8523c4b790dd51bf78b Mon Sep 17 00:00:00 2001 From: zeeZ Date: Mon, 9 May 2011 04:50:30 +0200 Subject: [PATCH] Fixed NPE if using regionless config. --- src/main/java/org/dynmap/JsonTimerTask.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java index e0ad0e55..dd88ffcf 100644 --- a/src/main/java/org/dynmap/JsonTimerTask.java +++ b/src/main/java/org/dynmap/JsonTimerTask.java @@ -86,8 +86,9 @@ class JsonTimerTask extends TimerTask { //Handles Updates for (World world : this.server.getWorlds()) { //Parse region file for multi world style - if(regions.getBoolean("useworldpath", false)) - parseRegionFile(world.getName() + "/" + regions.getString("filename", "regions.yml"), regions.getString("filename", "regions.yml").replace(".", "_" + world.getName() + ".yml")); + if (regions != null) + if (regions.getBoolean("useworldpath", false)) + parseRegionFile(world.getName() + "/" + regions.getString("filename", "regions.yml"), regions.getString("filename", "regions.yml").replace(".", "_" + world.getName() + ".yml")); current = System.currentTimeMillis(); @@ -125,8 +126,9 @@ class JsonTimerTask extends TimerTask { lastTimestamp = System.currentTimeMillis(); //Parse regions file for non worlds style - if (!regions.getBoolean("useworldpath", false)) - parseRegionFile(regions.getString("filename", "regions.yml"), regions.getString("filename", "regions.yml")); + if (null != regions) + if (!regions.getBoolean("useworldpath", false)) + parseRegionFile(regions.getString("filename", "regions.yml"), regions.getString("filename", "regions.yml")); } //handles parsing and writing region json files