Skip to content

Commit 2df09c6

Browse files
committed
Fix AdminChatEvent may only be triggered asynchronously.
1 parent 22c9250 commit 2df09c6

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

eternalcore-api/src/main/java/com/eternalcode/core/feature/adminchat/event/AdminChatEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class AdminChatEvent extends Event implements Cancellable {
2222
private boolean cancelled;
2323

2424
public AdminChatEvent(@NotNull CommandSender sender, @NotNull String content) {
25-
super(true);
25+
super(false);
2626

2727
if (sender == null) {
2828
throw new IllegalArgumentException("Sender cannot be null");

eternalcore-core/src/main/java/com/eternalcode/core/feature/adminchat/AdminChatChannelController.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.eternalcode.core.feature.adminchat;
22

3+
import com.eternalcode.commons.scheduler.Scheduler;
34
import com.eternalcode.core.injector.annotations.Inject;
45
import com.eternalcode.core.injector.annotations.component.Controller;
56
import org.bukkit.entity.Player;
@@ -14,10 +15,12 @@
1415
final class AdminChatChannelController implements Listener {
1516

1617
private final AdminChatService adminChatService;
18+
private final Scheduler scheduler;
1719

1820
@Inject
19-
AdminChatChannelController(@NotNull AdminChatService adminChatService) {
21+
AdminChatChannelController(@NotNull AdminChatService adminChatService, Scheduler scheduler) {
2022
this.adminChatService = adminChatService;
23+
this.scheduler = scheduler;
2124
}
2225

2326
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -30,7 +33,7 @@ void onPlayerChat(@NotNull AsyncPlayerChatEvent event) {
3033

3134
event.setCancelled(true);
3235

33-
this.adminChatService.sendAdminChatMessage(event.getMessage(), player);
36+
this.scheduler.run(() -> this.adminChatService.sendAdminChatMessage(event.getMessage(), player));
3437
}
3538

3639
@EventHandler(priority = EventPriority.MONITOR)

0 commit comments

Comments
 (0)