carm/UserPrefix
carm/UserPrefix
1
Fork 0
mirror of https://github.com/CarmJos/UserPrefix.git synced 2024-09-19 20:15:47 +00:00
Code Issues Releases Activity

fix(event): 采用新Event唤起方式

Browse Source
This commit is contained in:
Carm Jos 2022-07-01 18:48:50 +08:00
parent 2beefb71d4
commit cbd2a4373d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/cc/carm/plugin/userprefix/event/UserPrefixChangeEvent.java
View File

@ -2,13 +2,13 @@ package cc.carm.plugin.userprefix.event;
import cc.carm.plugin.userprefix.Main; import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig; import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
public class UserPrefixChangeEvent extends UserPrefixEvent implements Cancellable { public class UserPrefixChangeEvent extends UserPrefixEvent implements Cancellable {
@ -61,11 +61,8 @@ public class UserPrefixChangeEvent extends UserPrefixEvent implements Cancellabl
@Nullable PrefixConfig before, @Nullable PrefixConfig before,
@NotNull PrefixConfig after, @NotNull PrefixConfig after,
@Nullable Consumer<@Nullable PrefixConfig> finish) { @Nullable Consumer<@Nullable PrefixConfig> finish) {
Main.getInstance().getScheduler().run(() -> { Main.getInstance().callSync(new UserPrefixChangeEvent(who, before, after))
UserPrefixChangeEvent event = new UserPrefixChangeEvent(who, before, after); .thenAccept((e) -> Optional.ofNullable(finish).ifPresent(f -> f.accept(e.getAfter())));
Bukkit.getPluginManager().callEvent(event);
if (finish != null) finish.accept(event.isCancelled() ? null : event.getAfter());
});
} }
} }

2
src/main/java/cc/carm/plugin/userprefix/event/UserPrefixExpireEvent.java
View File

@ -30,7 +30,7 @@ public class UserPrefixExpireEvent extends UserPrefixEvent {
} }
public static void call(@NotNull Player player, @NotNull PrefixConfig currentPrefix) { public static void call(@NotNull Player player, @NotNull PrefixConfig currentPrefix) {
Main.getInstance().callEventSync(new UserPrefixExpireEvent(player, currentPrefix)); Main.getInstance().callSync(new UserPrefixExpireEvent(player, currentPrefix));
} }
} }