scheduler abuse

Author: Telesphoreo

src/main/java/dev/plex/NUSHModule.java

@@ -5,18 +5,22 @@
 import dev.plex.listener.ChatListener;
 import dev.plex.listener.JoinListener;
 import dev.plex.module.PlexModule;
-import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 import org.bukkit.entity.Player;
 
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class NUSHModule extends PlexModule
 {
     private ModuleConfiguration config;
-    private final Map<UUID, ScheduledTask> newPlayers = new ConcurrentHashMap<>();
+    private final Map<UUID, ScheduledFuture<?>> newPlayers = new ConcurrentHashMap<>();
+    private ScheduledExecutorService expiryExecutor;
     private boolean enabled;
     private int time;
 
@@ -31,6 +35,8 @@ public void load()
     @Override
     public void enable()
     {
+        expiryExecutor = Executors.newSingleThreadScheduledExecutor(
+                Thread.ofPlatform().daemon().name("Plex-NUSH-Expiry").factory());
         config.load();
         enabled = config.getBoolean("server.enabled", false);
         time = config.getInt("server.wait_time", 2);
@@ -41,6 +47,11 @@ public void enable()
     @Override
     public void disable()
     {
+        if (expiryExecutor != null)
+        {
+            expiryExecutor.shutdownNow();
+            expiryExecutor = null;
+        }
         clearNewPlayers();
     }
 
@@ -71,12 +82,14 @@ public void setTime(int minutes)
     public void queueNewPlayer(Player player)
     {
         UUID uuid = player.getUniqueId();
-        ScheduledTask task = scheduler().runAsyncLater(
-                scheduledTask -> newPlayers.remove(uuid, scheduledTask), time, TimeUnit.MINUTES);
-        ScheduledTask previous = newPlayers.put(uuid, task);
+        AtomicReference<ScheduledFuture<?>> taskReference = new AtomicReference<>();
+        ScheduledFuture<?> task = expiryExecutor.schedule(
+                () -> newPlayers.remove(uuid, taskReference.get()), time, TimeUnit.MINUTES);
+        taskReference.set(task);
+        ScheduledFuture<?> previous = newPlayers.put(uuid, task);
         if (previous != null)
         {
-            previous.cancel();
+            previous.cancel(false);
         }
     }
 
@@ -87,16 +100,16 @@ public boolean isNewPlayer(Player player)
 
     public void removePlayer(Player player)
     {
-        ScheduledTask task = newPlayers.remove(player.getUniqueId());
+        ScheduledFuture<?> task = newPlayers.remove(player.getUniqueId());
         if (task != null)
         {
-            task.cancel();
+            task.cancel(false);
         }
     }
 
     public void clearNewPlayers()
     {
-        newPlayers.values().forEach(ScheduledTask::cancel);
+        newPlayers.values().forEach(task -> task.cancel(false));
         newPlayers.clear();
     }
 }

src/main/java/dev/plex/listener/JoinListener.java

@@ -25,14 +25,7 @@ public void onJoin(PlayerJoinEvent event)
             module.api().logging().debug("Adding {0} to the new player list", player.getName());
             module.queueNewPlayer(player);
             String playerName = player.getName();
-            module.scheduler().runGlobal(() -> Bukkit.getOnlinePlayers().forEach(recipient ->
-                    module.scheduler().runEntity(recipient, () ->
-                    {
-                        if (recipient.hasPermission("plex.nush.view"))
-                        {
-                            recipient.sendMessage(module.messageComponent("newPlayerMarked", playerName, module.getTime()));
-                        }
-                    })));
+            Bukkit.broadcast(module.messageComponent("newPlayerMarked", playerName, module.getTime()), "plex.nush.view");
         }
     }
 }