Call events asynchronously in LegacyEventExecutor

Brikster · Jul 6, 2024 · 0665731 · 0665731
1 parent eecd23c
commit 0665731
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/spigot/src/main/java/ru/brikster/chatty/chat/executor/LegacyEventExecutor.java b/spigot/src/main/java/ru/brikster/chatty/chat/executor/LegacyEventExecutor.java
@@ -6,7 +6,6 @@
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
@@ -30,10 +29,10 @@
 import ru.brikster.chatty.config.file.MessagesConfig;
 import ru.brikster.chatty.config.file.SettingsConfig;
 import ru.brikster.chatty.proxy.ProxyService;
+import ru.brikster.chatty.util.EventUtil;
 
 import javax.inject.Inject;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -178,16 +177,7 @@ public void handleFinishedEarlyContextEvent(AsyncPlayerChatEvent event) {
                     List.copyOf(middleContext.getRecipients())
             );
 
-            Runnable callEventRunnable = () -> Bukkit.getPluginManager().callEvent(preMessageEvent);
-            if (Bukkit.isPrimaryThread()) {
-                CompletableFuture.runAsync(callEventRunnable)
-                        .exceptionally(e -> {
-                            logger.log(Level.SEVERE, "Error while calling ChattyPreMessageEvent", e);
-                            return null;
-                        });
-            } else {
-                callEventRunnable.run();
-            }
+            EventUtil.callAsynchronously(preMessageEvent);
 
             middleContext.setFormat(preMessageEvent.getFormat());
             middleContext.setMessage(preMessageEvent.getMessage());
@@ -201,7 +191,7 @@ public void handleFinishedEarlyContextEvent(AsyncPlayerChatEvent event) {
                     List.copyOf(middleContext.getRecipients())
             );
 
-            Bukkit.getPluginManager().callEvent(messageEvent);
+            EventUtil.callAsynchronously(messageEvent);
 
             if (middleContext.getChat().getSound() != null) {
                 for (Player recipient : middleContext.getRecipients()) {

diff --git a/spigot/src/main/java/ru/brikster/chatty/util/EventUtil.java b/spigot/src/main/java/ru/brikster/chatty/util/EventUtil.java
@@ -0,0 +1,31 @@
+package ru.brikster.chatty.util;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
+
+import java.util.concurrent.CompletableFuture;
+
+@UtilityClass
+public class EventUtil {
+
+    @SneakyThrows
+    public void callAsynchronously(Event event) {
+        if (Bukkit.isPrimaryThread()) {
+            Throwable throwable = CompletableFuture
+                    .supplyAsync(() -> {
+                        Bukkit.getPluginManager().callEvent(event);
+                        return (Throwable) null;
+                    })
+                    .exceptionally(t -> t)
+                    .join();
+            if (throwable != null) {
+                throw throwable;
+            }
+            return;
+        }
+        Bukkit.getPluginManager().callEvent(event);
+    }
+
+}