From cbd2a4373d197b369527da0c7f8f49b7fdba7d41 Mon Sep 17 00:00:00 2001 From: carm Date: Fri, 1 Jul 2022 18:48:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(event):=20=E9=87=87=E7=94=A8=E6=96=B0Event?= =?UTF-8?q?=E5=94=A4=E8=B5=B7=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/userprefix/event/UserPrefixChangeEvent.java | 9 +++------ .../plugin/userprefix/event/UserPrefixExpireEvent.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java index a848ab8..f3265f9 100644 --- a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java +++ b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java @@ -2,13 +2,13 @@ package cc.carm.plugin.userprefix.event; import cc.carm.plugin.userprefix.Main; import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Optional; import java.util.function.Consumer; public class UserPrefixChangeEvent extends UserPrefixEvent implements Cancellable { @@ -61,11 +61,8 @@ public class UserPrefixChangeEvent extends UserPrefixEvent implements Cancellabl @Nullable PrefixConfig before, @NotNull PrefixConfig after, @Nullable Consumer<@Nullable PrefixConfig> finish) { - Main.getInstance().getScheduler().run(() -> { - UserPrefixChangeEvent event = new UserPrefixChangeEvent(who, before, after); - Bukkit.getPluginManager().callEvent(event); - if (finish != null) finish.accept(event.isCancelled() ? null : event.getAfter()); - }); + Main.getInstance().callSync(new UserPrefixChangeEvent(who, before, after)) + .thenAccept((e) -> Optional.ofNullable(finish).ifPresent(f -> f.accept(e.getAfter()))); } } diff --git a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java index b1fc52f..773e4d9 100644 --- a/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java +++ b/src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java @@ -30,7 +30,7 @@ public class UserPrefixExpireEvent extends UserPrefixEvent { } public static void call(@NotNull Player player, @NotNull PrefixConfig currentPrefix) { - Main.getInstance().callEventSync(new UserPrefixExpireEvent(player, currentPrefix)); + Main.getInstance().callSync(new UserPrefixExpireEvent(player, currentPrefix)); } }