From 3faa57ee70bca88d417ab2544ca9f12f7cc86a46 Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 7 Nov 2012 10:09:13 +0800 Subject: [PATCH] Fix NPE when metrics has been opted out of --- src/main/java/net/citizensnpcs/Citizens.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java index 67bba41e7..7c13c9ea0 100644 --- a/src/main/java/net/citizensnpcs/Citizens.java +++ b/src/main/java/net/citizensnpcs/Citizens.java @@ -187,7 +187,8 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { Bukkit.getPluginManager().callEvent(new CitizensDisableEvent()); Editor.leaveAll(); CitizensAPI.shutdown(); - metrics.stop(); + if (metrics != null) + metrics.stop(); tearDownScripting(); // Don't bother with this part if MC versions are not compatible