Fix Effects Extender DB features

Author: UnknownSilicon

src/main/java/parallelmc/parallelutils/modules/effectextender/EffectExtender.java

@@ -8,9 +8,9 @@
 import parallelmc.parallelutils.Parallelutils;
 import parallelmc.parallelutils.modules.effectextender.commands.ParallelEffectsCommand;
 import parallelmc.parallelutils.modules.effectextender.listeners.EffectListener;
+import parallelmc.parallelutils.modules.effectextender.listeners.JoinLeaveListener;
 
 import java.sql.*;
-import java.util.UUID;
 import java.util.logging.Level;
 
 /**
@@ -19,7 +19,7 @@
 public class EffectExtender implements ParallelModule {
 
     // dont worry about it
-    public static Connection dbConn;
+    private Connection dbConn;
 
     @Override
     public void onEnable() {
@@ -33,12 +33,6 @@ public void onEnable() {
 
         Parallelutils puPlugin = (Parallelutils) plugin;
 
-        manager.registerEvents(new EffectListener(), plugin);
-
-        puPlugin.addCommand("effects", new ParallelEffectsCommand());
-
-        Parallelutils.log(Parallelutils.LOG_LEVEL, "EntityPotionEffectEvent registered successfully.");
-
         dbConn = puPlugin.getDbConn();
 
         // create effects table if it doesn't exist
@@ -58,6 +52,12 @@ EffectType      varchar(20) not null,
             e.printStackTrace();
         }
 
+        manager.registerEvents(new EffectListener(), plugin);
+        manager.registerEvents(new JoinLeaveListener(dbConn), plugin);
+
+        puPlugin.addCommand("effects", new ParallelEffectsCommand());
+
+        Parallelutils.log(Parallelutils.LOG_LEVEL, "EntityPotionEffectEvent registered successfully.");
     }
 
     @Override
@@ -83,6 +83,9 @@ public void onDisable() {
             });
 
             statement.executeBatch();
+
+            dbConn.commit();
+
             statement.close();
         } catch (SQLException e) {
             e.printStackTrace();

src/main/java/parallelmc/parallelutils/modules/effectextender/listeners/EffectListener.java

@@ -20,7 +20,6 @@
  */
 public class EffectListener implements Listener {
 
-    // TODO: Make this save across logging off or on and reboots
     public static HashMap<LivingEntity, HashMap<PotionEffectType, Integer>> playerEffects = new HashMap<>();
 
     // could put these in a hashmap but eh

src/main/java/parallelmc/parallelutils/modules/effectextender/listeners/JoinLeaveListener.java

@@ -1,27 +1,31 @@
 package parallelmc.parallelutils.modules.effectextender.listeners;
 
-import org.bukkit.entity.EvokerFangs;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.potion.PotionEffectType;
-import parallelmc.parallelutils.modules.effectextender.EffectExtender;
 
 import java.sql.*;
 import java.util.HashMap;
 
 public class JoinLeaveListener implements Listener {
 
+    private final Connection dbConn;
+
+    public JoinLeaveListener(Connection dbConn) {
+        this.dbConn = dbConn;
+    }
+
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         HashMap<PotionEffectType, Integer> effects = new HashMap<>();
         LivingEntity player = event.getPlayer();
         String uuid = player.getUniqueId().toString();
 
         try {
-            Statement statement = EffectExtender.dbConn.createStatement();
+            Statement statement = dbConn.createStatement();
             statement.setQueryTimeout(10);
             ResultSet result = statement.executeQuery(
                     "select * from PlayerEffects where UUID = '" + uuid + "'");
@@ -39,6 +43,8 @@ public void onPlayerJoin(PlayerJoinEvent event) {
                 statement.execute("delete from PlayerEffects where UUID = '" + uuid + "'");
             }
 
+            dbConn.commit();
+
             statement.close();
 
         } catch (SQLException e) {
@@ -54,12 +60,11 @@ public void onPlayerLeave(PlayerQuitEvent event) {
         if (!EffectListener.playerEffects.containsKey(player))
             return;
 
-
         try {
             HashMap<PotionEffectType, Integer> effects = EffectListener.playerEffects.get(player);
             String uuid = player.getUniqueId().toString();
             // prepare a batch of sql statements for each effect
-            PreparedStatement statement = EffectExtender.dbConn.prepareStatement("insert into PlayerEffects values (?, ?, ?)");
+            PreparedStatement statement = dbConn.prepareStatement("insert into PlayerEffects values (?, ?, ?)");
             statement.setQueryTimeout(60);
             effects.forEach((effect, maxDuration) -> {
                 // why do I HAVE to handle SQLExceptions
@@ -73,6 +78,7 @@ public void onPlayerLeave(PlayerQuitEvent event) {
                 }
             });
             statement.executeBatch();
+            dbConn.commit();
             statement.close();
         } catch (SQLException e) {
             e.printStackTrace();