Removed runTaskAsynchronously

EssentialsX · Aug 20, 2024 · 2292da7 · 2292da7
1 parent db87f11
commit 2292da7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/providers/PaperProvider/src/main/java/net/ess3/provider/AbstractAsyncChatEvent.java b/providers/PaperProvider/src/main/java/net/ess3/provider/AbstractAsyncChatEvent.java
@@ -1,30 +1,24 @@
 package net.ess3.provider;
 
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
 
-public class AbstractAsyncChatEvent extends Event {
+public class AbstractAsyncChatEvent extends PlayerEvent {
     private static final HandlerList handlers = new HandlerList();
 
-    private final Player player;
     private final String legacyMessage;
     private final Set<Player> playerRecipients;
 
-    public AbstractAsyncChatEvent(Player player, String message, Set<Player> recipients) {
-        super(true);
-        this.player = player;
+    public AbstractAsyncChatEvent(boolean async, Player sender, String message, Set<Player> recipients) {
+        super(sender, async);
         this.legacyMessage = message;
         this.playerRecipients = recipients;
     }
 
-    public Player getPlayer() {
-        return player;
-    }
-
     public String getMessage() {
         return legacyMessage;
     }

diff --git a/...perProvider/src/main/java/net/ess3/provider/providers/PaperAsyncChatListenerProvider.java b/...perProvider/src/main/java/net/ess3/provider/providers/PaperAsyncChatListenerProvider.java
@@ -35,16 +35,15 @@ public PaperAsyncChatListenerProvider(JavaPlugin plugin) {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onAsyncChatEvent(final AsyncChatEvent event) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, () ->
-                Bukkit.getPluginManager().callEvent(
-                        new AbstractAsyncChatEvent(
-                                event.getPlayer(),
-                                serializer.serialize(event.message()),
-                                event.viewers().stream()
-                                        .filter(v -> v instanceof Player)
-                                        .map(v -> (Player) v)
-                                        .collect(Collectors.toSet())
-                        )
+        Bukkit.getPluginManager().callEvent(
+                new AbstractAsyncChatEvent(
+                        event.isAsynchronous(),
+                        event.getPlayer(),
+                        serializer.serialize(event.message()),
+                        event.viewers().stream()
+                                .filter(v -> v instanceof Player)
+                                .map(v -> (Player) v)
+                                .collect(Collectors.toSet())
                 )
         );
     }