From 77c035c2cb745358911cd1d48ad4a034ec917fb7 Mon Sep 17 00:00:00 2001
From: carm <Karmun@foxmail.com>
Date: Fri, 1 Jul 2022 18:39:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(main):=20=E7=A7=BB=E9=99=A4=20isInitialized?=
 =?UTF-8?q?()=20=E6=96=B9=E6=B3=95=20(=E4=B8=8E=E9=83=A8=E5=88=86=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=AB=AF=E5=86=B2=E7=AA=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/carm/lib/easyplugin/EasyPlugin.java    | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/base/main/src/main/java/cc/carm/lib/easyplugin/EasyPlugin.java b/base/main/src/main/java/cc/carm/lib/easyplugin/EasyPlugin.java
index fba4793..3e48999 100644
--- a/base/main/src/main/java/cc/carm/lib/easyplugin/EasyPlugin.java
+++ b/base/main/src/main/java/cc/carm/lib/easyplugin/EasyPlugin.java
@@ -45,8 +45,8 @@ public abstract class EasyPlugin extends JavaPlugin {
         this.messageProvider = messageProvider;
     }
 
-    private SchedulerUtils scheduler;
-    private boolean initialized = false;
+    protected SchedulerUtils scheduler;
+    protected boolean initialized = false;
 
     @Override
     public final void onLoad() {
@@ -79,7 +79,7 @@ public abstract class EasyPlugin extends JavaPlugin {
 
     @Override
     public final void onDisable() {
-        if (!hasOverride("shutdown") || !isInitialized()) return;
+        if (!hasOverride("shutdown") || !this.initialized) return;
         outputInfo();
 
         log(messageProvider.disabling(this));
@@ -103,10 +103,6 @@ public abstract class EasyPlugin extends JavaPlugin {
         Optional.ofNullable(JarResourceUtils.readResource(this.getResource("PLUGIN_INFO"))).ifPresent(this::log);
     }
 
-    public boolean isInitialized() {
-        return initialized;
-    }
-
     public boolean isDebugging() {
         return false;
     }
@@ -149,15 +145,16 @@ public abstract class EasyPlugin extends JavaPlugin {
         if (isDebugging()) print("&8[DEBUG] &r", messages);
     }
 
-    public void callEventSync(Event event) {
-        getScheduler().run(() -> Bukkit.getPluginManager().callEvent(event));
+    public @NotNull <T extends Event> CompletableFuture<T> callSync(T event) {
+        CompletableFuture<T> future = new CompletableFuture<>();
+        getScheduler().run(() -> {
+            Bukkit.getPluginManager().callEvent(event);
+            future.complete(event);
+        });
+        return future;
     }
 
-    public void callEventAsync(Event event) {
-        getScheduler().runAsync(() -> Bukkit.getPluginManager().callEvent(event));
-    }
-
-    public @NotNull <T extends Event> CompletableFuture<T> callEventFuture(T event) {
+    public @NotNull <T extends Event> CompletableFuture<T> callAsync(T event) {
         return CompletableFuture.supplyAsync(() -> {
             Bukkit.getPluginManager().callEvent(event);
             return event;