Merge pull request #1 from swnck/feature/async

Feature/async
jkvn · Mar 7, 2024 · 83b98df · 83b98df
2 parents a915112 + 192c16f
commit 83b98df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -164,7 +164,7 @@ public void onListenYourFavoriteEvent(YourFavoriteEvent event) {
 
 ## Future Plans 🛌
 
-- [ ] Asynchronous events
+- [x] Asynchronous events
 - [x] Event cancellation
 - [x] Event listener registration
 - [x] Event listener deregistration

diff --git a/src/main/java/at/jkvn/eventlib/EventLib.java b/src/main/java/at/jkvn/eventlib/EventLib.java
@@ -32,29 +32,26 @@ public class EventLib {
 
     @SneakyThrows
     public static void call(Event event) {
-        if (isAutomatic()) {
-            invokeMethods(getMethods(), event, false);
-            return;
-        }
-
-        (new ArrayList<>(listeners)).forEach(listener -> {
-            invokeMethods(Arrays.stream(listener.getClass().getMethods()).toList(), event, false);
-        });
+        callEvent(event);
     }
 
     @SneakyThrows
     public static void callAsync(Event event) {
+        executor.execute(() -> callEvent(event));
+    }
+
+    private static void callEvent(Event event) {
         if (isAutomatic()) {
-            invokeMethods(getMethods(), event, true);
+            invokeMethods(getMethods(), event);
             return;
         }
 
         (new ArrayList<>(listeners)).forEach(listener -> {
-            invokeMethods(Arrays.stream(listener.getClass().getMethods()).toList(), event, true);
+            invokeMethods(Arrays.stream(listener.getClass().getMethods()).toList(), event);
         });
     }
 
-    private static void invokeMethods(List<Method> methods, Event event, boolean async) {
+    private static void invokeMethods(List<Method> methods, Event event) {
         methods.stream()
                 .filter(method -> method.getParameterCount() == 1
                         && method.getParameterTypes()[0].isAssignableFrom(event.getClass()))
@@ -63,11 +60,9 @@ private static void invokeMethods(List<Method> methods, Event event, boolean asy
                     return priority != null ? priority.value().ordinal() : EventPriority.NORMAL.ordinal();
                 }))
                 .forEach(method -> {
-                    if (async)  {
-                        executor.execute(() -> invokeSafely(method, event));
-                        return;
+                    if (!event.isCancelled()) {
+                        invokeSafely(method, event);
                     }
-                    invokeSafely(method, event);
                 });
     }