summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-08-31 14:09:20 +0100
committerKHobbits <rob@khobbits.co.uk>2012-08-31 14:09:20 +0100
commit2ac4c8e665acea3cea4479512fea18aece6f288a (patch)
tree51ddee7e4276dc0872d765d2a4ac7167d9a834e3
parentce90e9710ef7aad39e8079de519dbfb5ffb7c7d0 (diff)
downloadEssentials-2ac4c8e665acea3cea4479512fea18aece6f288a.tar
Essentials-2ac4c8e665acea3cea4479512fea18aece6f288a.tar.gz
Essentials-2ac4c8e665acea3cea4479512fea18aece6f288a.tar.lz
Essentials-2ac4c8e665acea3cea4479512fea18aece6f288a.tar.xz
Essentials-2ac4c8e665acea3cea4479512fea18aece6f288a.zip
Fix metrics when kits are improperly configured.
-rw-r--r--Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
index 9638d8d5e..b0592855d 100644
--- a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
+++ b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
@@ -7,6 +7,7 @@ import com.earth2me.essentials.register.payment.Method;
import com.earth2me.essentials.register.payment.methods.VaultEco;
import java.util.Locale;
import java.util.logging.Level;
+import org.bukkit.configuration.ConfigurationSection;
public class MetricsStarter implements Runnable
@@ -100,7 +101,9 @@ public class MetricsStarter implements Runnable
@Override
public int getValue()
{
- return ess.getSettings().getKits().getKeys(false).size();
+ ConfigurationSection kits = ess.getSettings().getKits();
+ if (kits == null) { return 0; }
+ return kits.getKeys(false).size();
}
});
featureGraph.addPlotter(new Plotter("Warps")
@@ -123,7 +126,7 @@ public class MetricsStarter implements Runnable
{
enabledGraph.addPlotter(new SimplePlotter("Jails"));
}
- if (ess.getSettings().getKits().getKeys(false).size() > 0)
+ if (ess.getSettings().getKits() != null && ess.getSettings().getKits().getKeys(false).size() > 0)
{
enabledGraph.addPlotter(new SimplePlotter("Kits"));
}