Skip to content

fix: avoid concurrent command tree rebuilds #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YsGqHY merged 1 commit into from
Sep 30, 2026
Merged

fix: avoid concurrent command tree rebuilds #278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions plugin/src/main/kotlin/trplugins/menu/module/internal/service/RegisterCommands.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import taboolib.common.platform.command.command
import taboolib.common.platform.function.adaptPlayer
import taboolib.common.platform.function.submit
import taboolib.common.platform.function.unregisterCommand
import taboolib.platform.util.onlinePlayers
import trplugins.menu.TrMenu
import trplugins.menu.TrMenu.actionHandle
import trplugins.menu.api.reaction.Reactions
Expand All @@ -21,6 +20,7 @@ import trplugins.menu.util.conf.Property
object RegisterCommands {

private val registered = mutableSetOf<String>()
private var loadedConfiguration: Map<String, Any?>? = null

private fun ofReaction(any: Any?): Reactions {
return Reactions.ofReaction(actionHandle, Property.asAnyList(any))
Expand All @@ -33,11 +33,17 @@ object RegisterCommands {
}
return
}

val section = TrMenu.SETTINGS.getConfigurationSection("RegisterCommands")
val configuration = section?.getValues(true)?.toMap() ?: emptyMap()
if (configuration == loadedConfiguration) {
return
}

val unregisterList = registered.toList()
unregisterList.forEach { unregisterCommand(it) }
registered.clear()

val section = TrMenu.SETTINGS.getConfigurationSection("RegisterCommands")
section?.let { it ->
for (main in it.getKeys(false)) {
val section = it.getConfigurationSection(main) ?: continue
Expand Down Expand Up @@ -81,15 +87,6 @@ object RegisterCommands {
}
}
}

// 延迟同步命令到所有在线玩家，避免与 Paper 异步命令发送线程冲突
// Paper 的 sendAsync 会在异步线程遍历命令树，直接调用 updateCommands 可能触发 ConcurrentModificationException
submit(delay = 1) {
val players = onlinePlayers
if (players.isEmpty()) {
return@submit
}
players.forEach { it.updateCommands() }
}
loadedConfiguration = configuration
}
}