From 0093e7d245e472df9816e42c9970f0a09ac80b18 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Tue, 24 Oct 2017 12:39:01 +0300
Subject: [PATCH] Prevented NPE of #352 from occurring

---
 .../djrapitops/plan/data/AnalysisData.java    | 33 ++++---------------
 .../plan/utilities/analysis/Analysis.java     |  1 -
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java
index 19ec39118..b944ce06f 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java
@@ -1,6 +1,5 @@
 package main.java.com.djrapitops.plan.data;
 
-import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.data.analysis.*;
 import main.java.com.djrapitops.plan.utilities.Benchmark;
@@ -38,7 +37,6 @@ public class AnalysisData extends RawData {
     private final TPSPart tpsPart;
     private final WorldPart worldPart;
     private long refreshDate;
-    private String planVersion;
     private String pluginsTabLayout;
     private Map<String, Serializable> additionalDataReplaceMap;
     private String playersTable;
@@ -97,26 +95,10 @@ public class AnalysisData extends RawData {
                 worldPart);
     }
 
-    public String getPlanVersion() {
-        return planVersion;
-    }
-
-    public void setPlanVersion(String planVersion) {
-        this.planVersion = planVersion;
-    }
-
-    public String getPluginsTabLayout() {
-        return pluginsTabLayout;
-    }
-
     public void setPluginsTabLayout(String pluginsTabLayout) {
         this.pluginsTabLayout = pluginsTabLayout;
     }
 
-    public Map<String, Serializable> getAdditionalDataReplaceMap() {
-        return additionalDataReplaceMap;
-    }
-
     public void setAdditionalDataReplaceMap(Map<String, Serializable> additionalDataReplaceMap) {
         this.additionalDataReplaceMap = additionalDataReplaceMap;
     }
@@ -127,12 +109,15 @@ public class AnalysisData extends RawData {
 
     @Override
     protected void analyse() {
-        Verify.nullCheck(playersTable);
-        Verify.nullCheck(pluginsTabLayout);
-        Verify.nullCheck(planVersion);
+        if (playersTable == null) {
+            playersTable = "";
+        }
+        if (pluginsTabLayout == null) {
+            pluginsTabLayout = "";
+        }
 
         addValue("tableBodyPlayerList", playersTable);
-        addValue("version", planVersion);
+        addValue("version", MiscUtils.getIPlan().getVersion());
 
         final List<RawData> parts = getAllParts();
         parts.forEach(part -> {
@@ -157,8 +142,4 @@ public class AnalysisData extends RawData {
     public long getRefreshDate() {
         return refreshDate;
     }
-
-    public void setRefreshDate(long refreshDate) {
-        this.refreshDate = refreshDate;
-    }
 }
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
index c852c2ce7..0e64c4954 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
@@ -110,7 +110,6 @@ public class Analysis {
             AnalysisData analysisData = new AnalysisData();
             List<PluginData> thirdPartyPlugins = plugin.getHookHandler().getAdditionalDataSources();
             analysisData.setPluginsTabLayout(HtmlStructure.createAnalysisPluginsTabLayout(thirdPartyPlugins));
-            analysisData.setPlanVersion(plugin.getVersion());
 
             Benchmark.stop("Analysis", "Create Empty dataset");
             fillDataset(analysisData, db);