From 3094079a8079266f02cca06853d3b1d260016cbf Mon Sep 17 00:00:00 2001
From: Fuzzlemann <zhang.paul@ymail.com>
Date: Thu, 3 Aug 2017 20:01:43 +0200
Subject: [PATCH] Remove unnecessary != null check

---
 .../plan/data/cache/queue/DataCacheSaveQueue.java          | 3 +--
 .../com/djrapitops/plan/data/handling/LogoutHandling.java  | 7 +++++++
 .../djrapitops/plan/data/handling/PlaytimeHandling.java    | 7 +++++++
 .../plan/data/handling/importing/ImportUtils.java          | 7 +++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheSaveQueue.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheSaveQueue.java
index e2b624a90..75d91527e 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheSaveQueue.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheSaveQueue.java
@@ -117,8 +117,7 @@ class SaveConsumer extends Consumer<UserData> {
             db.saveUserData(data);
             data.stopAccessing();
             Log.debug(uuid + ": Saved!");
-            if (data.shouldClearAfterSave()
-                    && handler != null) {
+            if (data.shouldClearAfterSave()) {
                 handler.getClearTask().scheduleForClear(uuid);
             }
         } catch (SQLException ex) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java
index ea1ec1038..733f12124 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/LogoutHandling.java
@@ -11,6 +11,13 @@ import main.java.com.djrapitops.plan.data.UserData;
  */
 public class LogoutHandling {
 
+    /**
+     * Constructor used to hide the public constructor
+     */
+    private LogoutHandling() {
+        throw new IllegalStateException("Utility class");
+    }
+
     /**
      * Processes the information of the Event and changes UserData object
      * accordingly.
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java
index 3a7e301d2..aa94f9ca0 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/PlaytimeHandling.java
@@ -6,6 +6,13 @@ import main.java.com.djrapitops.plan.data.time.WorldTimes;
 
 public class PlaytimeHandling {
 
+    /**
+     * Constructor used to hide the public constructor
+     */
+    private PlaytimeHandling() {
+        throw new IllegalStateException("Utility class");
+    }
+
     public static void processPlaytimeDependentInfo(UserData data, long time, String gamemode, String worldName) {
         long diff = time - data.getLastPlayed();
         long playTime = data.getPlayTime() + diff;
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java
index 546d315a6..08040252e 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/handling/importing/ImportUtils.java
@@ -16,6 +16,13 @@ import static org.bukkit.Bukkit.getPluginManager;
  */
 public class ImportUtils {
 
+    /**
+     * Constructor used to hide the public constructor
+     */
+    private ImportUtils() {
+        throw new IllegalStateException("Utility class");
+    }
+
     /**
      * Checks if a plugin is enabled.
      *