From 5ad7f3f591224eff8cdfb0ec6dcf85ab7c64337f Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Thu, 16 Aug 2018 12:21:55 +0300
Subject: [PATCH] Fixed sponge metrics

---
 Plan/src/main/java/com/djrapitops/plan/PlanSponge.java |  6 +++++-
 .../plan/utilities/metrics/BStatsSponge.java           | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java b/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java
index f13ddc60b..a88e42f62 100644
--- a/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java
+++ b/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java
@@ -14,6 +14,7 @@ import com.djrapitops.plugin.api.utility.log.DebugLog;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.settings.ColorScheme;
 import com.google.inject.Inject;
+import org.bstats.sponge.Metrics;
 import org.slf4j.Logger;
 import org.spongepowered.api.config.ConfigDir;
 import org.spongepowered.api.event.Listener;
@@ -27,6 +28,9 @@ import java.io.InputStream;
 @Plugin(id = "plan", name = "Plan", version = "4.4.3", description = "Player Analytics Plugin by Rsl1122", authors = {"Rsl1122"})
 public class PlanSponge extends SpongePlugin implements PlanPlugin {
 
+    @Inject
+    private Metrics metrics;
+
     @Inject
     private Logger logger;
 
@@ -58,7 +62,7 @@ public class PlanSponge extends SpongePlugin implements PlanPlugin {
             locale = system.getLocaleSystem().getLocale();
             system.enable();
 
-            new BStatsSponge().registerMetrics();
+            new BStatsSponge(metrics).registerMetrics();
 
             Log.info(locale.getString(PluginLang.ENABLED));
         } catch (AbstractMethodError e) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStatsSponge.java b/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStatsSponge.java
index 327048f5a..15c2cd6c3 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStatsSponge.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStatsSponge.java
@@ -5,18 +5,22 @@ import com.djrapitops.plan.system.info.connection.ConnectionSystem;
 import com.djrapitops.plugin.api.utility.log.Log;
 import org.bstats.sponge.Metrics;
 
-import javax.inject.Inject;
 import java.io.Serializable;
 
 public class BStatsSponge {
 
-    @Inject
-    private Metrics metrics;
+    private final Metrics metrics;
+
+    public BStatsSponge(Metrics metrics) {
+        this.metrics = metrics;
+    }
 
     public void registerMetrics() {
         Log.logDebug("Enable", "Enabling bStats Metrics.");
         if (metrics != null) {
             registerConfigSettingGraphs();
+        } else {
+            Log.debug("Metrics not injected properly.");
         }
     }