From 9bb3ec89167102b43aa41383d4b51b39b502a341 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Sun, 27 Aug 2023 23:23:42 -0400 Subject: [PATCH] Change the result of `call` to a boolean Returns true if logic execution should continue, false if logic condition should terminate --- src/main/java/emu/grasscutter/server/event/Event.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/server/event/Event.java b/src/main/java/emu/grasscutter/server/event/Event.java index 6e4df304e..bedf6953d 100644 --- a/src/main/java/emu/grasscutter/server/event/Event.java +++ b/src/main/java/emu/grasscutter/server/event/Event.java @@ -17,9 +17,15 @@ public abstract class Event { else throw new UnsupportedOperationException("Event is not cancellable."); } - /** Pushes this event to all listeners. */ - public void call() { + /** + * Pushes this event to all listeners. + * + * @return True if execution should continue. False if execution should cancel. + */ + public boolean call() { var pluginManager = Grasscutter.getPluginManager(); if (pluginManager != null) pluginManager.invokeEvent(this); + + return !this.isCanceled(); } }