Add extra checks to help prevent doubled join messages after reload

axemwa · Aug 25, 2019 · 62c62c0 · 62c62c0
1 parent 45d5bcf
commit 62c62c0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/main/java/me/shanodekono/nostrip/NoStrip.java b/src/main/java/me/shanodekono/nostrip/NoStrip.java
@@ -3,6 +3,7 @@
 import me.shanodekono.nostrip.commands.NoStripCommand;
 import me.shanodekono.nostrip.listeners.PlayerInteractListener;
 import me.shanodekono.nostrip.listeners.PlayerJoinListener;
+import me.shanodekono.nostrip.listeners.PlayerQuitListener;
 import me.shanodekono.nostrip.utils.ConfigUtils;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
@@ -22,6 +23,7 @@ public void onEnable() {
         cfgUtils.loadConfig();
 
         getServer().getPluginManager().registerEvents(new PlayerJoinListener(cfgUtils), this);
+        getServer().getPluginManager().registerEvents(new PlayerQuitListener(cfgUtils), this);
         getServer().getPluginManager().registerEvents(new PlayerInteractListener(cfgUtils), this);
         getCommand("nostrip").setExecutor(new NoStripCommand(cfgUtils));
     }

diff --git a/src/main/java/me/shanodekono/nostrip/listeners/PlayerJoinListener.java b/src/main/java/me/shanodekono/nostrip/listeners/PlayerJoinListener.java
@@ -28,7 +28,7 @@ private void onJoin(PlayerJoinEvent event) {
         if (!cfgUtils.toggleDefaultOn && !cfgUtils.toggle.contains(event.getPlayer().getUniqueId())) {
             cfgUtils.toggle.add(event.getPlayer().getUniqueId());
         }
-        if (cfgUtils.toggle.contains(event.getPlayer().getUniqueId())) {
+        if (cfgUtils.toggle.contains(event.getPlayer().getUniqueId()) && (!cfgUtils.toggleDefaultOn)) {
             BukkitScheduler scheduler = getServer().getScheduler();
             scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
                 public void run() {
@@ -42,7 +42,7 @@ public void run() {
         if (cfgUtils.toggleDefaultOn && cfgUtils.toggle.contains(event.getPlayer().getUniqueId())) {
             cfgUtils.toggle.remove(event.getPlayer().getUniqueId());
         }
-        if (!cfgUtils.toggle.contains(event.getPlayer().getUniqueId())) {
+        if (!cfgUtils.toggle.contains(event.getPlayer().getUniqueId()) && (cfgUtils.toggleDefaultOn)) {
             BukkitScheduler scheduler = getServer().getScheduler();
             scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
                 public void run() {

diff --git a/src/main/java/me/shanodekono/nostrip/listeners/PlayerQuitListener.java b/src/main/java/me/shanodekono/nostrip/listeners/PlayerQuitListener.java
@@ -0,0 +1,29 @@
+package me.shanodekono.nostrip.listeners;
+
+import me.shanodekono.nostrip.utils.ConfigUtils;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+public class PlayerQuitListener implements Listener {
+
+    private ConfigUtils cfgUtils;
+
+    public  PlayerQuitListener(ConfigUtils configUtils) {
+
+        cfgUtils = configUtils;
+    }
+
+    @EventHandler
+
+    private void onQuit(PlayerQuitEvent event) {
+
+        if (!cfgUtils.toggleDefaultOn && !cfgUtils.toggle.contains(event.getPlayer().getUniqueId())) {
+            cfgUtils.toggle.add(event.getPlayer().getUniqueId());
+        }
+
+        if (cfgUtils.toggleDefaultOn && cfgUtils.toggle.contains(event.getPlayer().getUniqueId())) {
+            cfgUtils.toggle.remove(event.getPlayer().getUniqueId());
+        }
+    }
+}