nachonekoawa/Lophine
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix up BotList

Browse Source
This commit is contained in:
Helvetica Volubi
2026-07-31 01:07:56 +08:00
parent dd7ef6701a
commit 952c4321d9
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lophine-server/src/main/java/org/leavesmc/leaves/bot/BotList.java
+16 -1
View File
@@ -261,7 +261,22 @@ public class BotList {
return bot; return bot;
} }
/*
* return true if async
*/
public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean save, boolean resume, boolean async) {
if (async && !TickThread.isTickThreadFor(bot.level(), bot.getX(), bot.getZ())) {
bot.getBukkitEntity().taskScheduler.schedule((Entity unused) -> this.removeBot(bot, reason, remover, save, resume), null, 1L);
return true; // async always return true
}
return this.removeBot(bot, remover, reason, save, resume);
}
public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean save, boolean resume) { public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean save, boolean resume) {
return this.removeBot(bot, reason, remover, save, resume, true);
}
public boolean removeBot(@NotNull ServerBot bot, @Nullable CommandSender remover, @NotNull BotRemoveEvent.RemoveReason reason, boolean save, boolean resume) {
BotRemoveEvent event = new BotRemoveEvent(bot.getBukkitEntity(), reason, remover, PaperAdventure.asAdventure(Component.translatable("multiplayer.player.left", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)), save); BotRemoveEvent event = new BotRemoveEvent(bot.getBukkitEntity(), reason, remover, PaperAdventure.asAdventure(Component.translatable("multiplayer.player.left", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)), save);
this.server.server.getPluginManager().callEvent(event); this.server.server.getPluginManager().callEvent(event);
@@ -270,7 +285,7 @@ public class BotList {
} }
if (bot.removeTaskId != -1) { if (bot.removeTaskId != -1) {
Bukkit.getScheduler().cancelTask(bot.removeTaskId); Bukkit.getGlobalRegionScheduler().cancelTask(bot.removeTaskId);
bot.removeTaskId = -1; bot.removeTaskId = -1;
} }