feat: refactoring and fix npe

Author: hardcorefactions

src/main/java/me/davidml16/aparkour/Main.java

@@ -1,12 +1,8 @@
 package me.davidml16.aparkour;
 
-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Collections;
-
-import me.davidml16.aparkour.placeholders.PlaceholderHook;
 import me.davidml16.aparkour.api.ParkourAPI;
+import me.davidml16.aparkour.commands.Command_AParkour;
+import me.davidml16.aparkour.commands.TabCompleter_AParkour;
 import me.davidml16.aparkour.data.CommandBlocker;
 import me.davidml16.aparkour.database.DatabaseHandler;
 import me.davidml16.aparkour.database.types.Database;
@@ -15,6 +11,8 @@
 import me.davidml16.aparkour.gui.*;
 import me.davidml16.aparkour.handlers.*;
 import me.davidml16.aparkour.managers.*;
+import me.davidml16.aparkour.placeholders.PlaceholderHook;
+import me.davidml16.aparkour.tasks.HologramTask;
 import me.davidml16.aparkour.tasks.ReturnTask;
 import me.davidml16.aparkour.utils.*;
 import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI;
@@ -27,9 +25,10 @@
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import me.davidml16.aparkour.commands.TabCompleter_AParkour;
-import me.davidml16.aparkour.commands.Command_AParkour;
-import me.davidml16.aparkour.tasks.HologramTask;
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Collections;
 
 public class Main extends JavaPlugin {
 
@@ -47,7 +46,6 @@ public class Main extends JavaPlugin {
     private PlayParkour_GUI playParkourGUI;
 
     private HologramTask hologramTask;
-    private ReturnTask returnTask;
 
     private TimerManager timerManager;
     private StatsHologramManager statsHologramManager;
@@ -72,8 +70,6 @@ public class Main extends JavaPlugin {
 
     private CommandBlocker commandBlocker;
 
-    private MetricsLite metrics;
-
     private ParkourAPI parkourAPI;
 
     private boolean hologramsEnabled;
@@ -85,7 +81,7 @@ public class Main extends JavaPlugin {
 
     public void onEnable() {
         instance = this;
-        metrics = new MetricsLite(this, 6728);
+        MetricsLite metrics = new MetricsLite(this, 6728);
         log = Bukkit.getConsoleSender();
 
         saveDefaultConfig();
@@ -178,7 +174,7 @@ public void onEnable() {
         hologramTask = new HologramTask(this);
         hologramTask.start();
 
-        returnTask = new ReturnTask(this);
+        ReturnTask returnTask = new ReturnTask(this);
         returnTask.start();
 
         soundUtil = new SoundUtil(this);
@@ -197,11 +193,7 @@ public void onEnable() {
 
         for (Player p : Bukkit.getOnlinePlayers()) {
             playerDataHandler.loadPlayerData(p);
-            try {
-                databaseHandler.getDatabase().updatePlayerName(p);
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
+            databaseHandler.getDatabase().updatePlayerName(p);
             statsHologramManager.loadStatsHolograms(p);
         }
 

src/main/java/me/davidml16/aparkour/MetricsLite.java

@@ -1,11 +1,17 @@
 package me.davidml16.aparkour;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.ServicePriority;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -17,19 +23,6 @@
 import java.util.logging.Level;
 import java.util.zip.GZIPOutputStream;
 
-import javax.net.ssl.HttpsURLConnection;
-
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.ServicePriority;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
 /**
  * bStats collects some data for plugin authors.
  * <p>
@@ -63,7 +56,7 @@ public class MetricsLite {
 	private static final String URL = "https://bStats.org/submitData/bukkit";
 
 	// Is bStats enabled on this server?
-	private boolean enabled;
+	private final boolean enabled;
 
 	// Should failed requests be logged?
 	private static boolean logFailedRequests;

src/main/java/me/davidml16/aparkour/api/ParkourAPI.java

@@ -7,9 +7,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 public class ParkourAPI {

src/main/java/me/davidml16/aparkour/api/events/ParkourCheckpointEvent.java

@@ -8,8 +8,8 @@
 public class ParkourCheckpointEvent extends Event {
 
     public static final HandlerList handlers = new HandlerList();
-    private Player p;
-    private Parkour parkour;
+    private final Player p;
+    private final Parkour parkour;
 
     public ParkourCheckpointEvent(Player p, Parkour parkour) {
         this.p = p;

src/main/java/me/davidml16/aparkour/api/events/ParkourEndEvent.java

@@ -8,8 +8,8 @@
 public class ParkourEndEvent extends Event {
 
     public static final HandlerList handlers = new HandlerList();
-    private Player p;
-    private Parkour parkour;
+    private final Player p;
+    private final Parkour parkour;
 
     public ParkourEndEvent(Player p, Parkour parkour) {
         this.p = p;

src/main/java/me/davidml16/aparkour/api/events/ParkourReturnEvent.java

@@ -8,8 +8,8 @@
 public class ParkourReturnEvent extends Event {
 
     public static final HandlerList handlers = new HandlerList();
-    private Player p;
-    private Parkour parkour;
+    private final Player p;
+    private final Parkour parkour;
 
     public ParkourReturnEvent(Player p, Parkour parkour) {
         this.p = p;

src/main/java/me/davidml16/aparkour/api/events/ParkourStartEvent.java

@@ -8,8 +8,8 @@
 public class ParkourStartEvent extends Event {
 
     public static final HandlerList handlers = new HandlerList();
-    private Player p;
-    private Parkour parkour;
+    private final Player p;
+    private final Parkour parkour;
 
     public ParkourStartEvent(Player p, Parkour parkour) {
         this.p = p;