Call ChattyPreMessageEvent asynchronously in main thread

Brikster · Feb 5, 2024 · 15522ff · 15522ff
1 parent b88aa9f
commit 15522ff
Showing 1 changed file with 12 additions and 1 deletion.
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
@@ -33,6 +33,7 @@
 
 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;
@@ -177,7 +178,17 @@ public void handleFinishedEarlyContextEvent(AsyncPlayerChatEvent event) {
                     List.copyOf(middleContext.getRecipients())
             );
 
-            Bukkit.getPluginManager().callEvent(preMessageEvent);
+            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();
+            }
+
             middleContext.setFormat(preMessageEvent.getFormat());
             middleContext.setMessage(preMessageEvent.getMessage());