diff --git a/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Chat.kt b/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Chat.kt index 868ea040..a141b315 100644 --- a/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Chat.kt +++ b/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Chat.kt @@ -17,7 +17,7 @@ class Chat(handle: ActionHandle) : ActionBase(handle) { override val regex = "chat|send|say".toRegex() override fun onExecute(contents: ActionContents, player: ProxyPlayer, placeholderPlayer: ProxyPlayer) { - contents.stringContent().parseContentSplited(placeholderPlayer, contents.stringContent()).forEach { + contents.stringContent().parseContentSplited(placeholderPlayer).forEach { player.chat(it) } } diff --git a/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Command.kt b/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Command.kt index c70fd3c4..7832fe14 100644 --- a/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Command.kt +++ b/api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Command.kt @@ -23,7 +23,7 @@ class Command(handle: ActionHandle) : ActionBase(handle) { placeholderPlayer.parseContentSplited(contents.stringContent(), ";").forEach { // Folia 必须使用实体调度器 暂时不做优雅的兼容性处理 后期其他功能需要单独处理Folia时再修改 if (Folia.isFolia) { - FoliaUtil.invokeCommandWithEntityScheduler(player,it) + FoliaUtil.invokeCommandWithEntityScheduler(player, it) }else{ submit(async = false) { player.performCommand(it) diff --git a/api/action/src/main/kotlin/trplugins/menu/api/utils/FoliaUtil.kt b/api/action/src/main/kotlin/trplugins/menu/api/utils/FoliaUtil.kt index b0d32596..6ecf9924 100644 --- a/api/action/src/main/kotlin/trplugins/menu/api/utils/FoliaUtil.kt +++ b/api/action/src/main/kotlin/trplugins/menu/api/utils/FoliaUtil.kt @@ -11,7 +11,7 @@ import taboolib.platform.BukkitPlugin */ object FoliaUtil { - fun invokeCommandWithEntityScheduler(player: ProxyPlayer,command:String){ + fun invokeCommandWithEntityScheduler(player: ProxyPlayer, command:String){ getEntityScheduler(player).execute(BukkitPlugin.getInstance(),{ player.performCommand(command) },null,0) diff --git a/build.gradle.kts b/build.gradle.kts index 2053f0df..778c0358 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ subprojects { repoTabooLib = "https://repo.aeoliancloud.com/repository/releases" } version { - taboolib = "6.2.3-052537b" + taboolib = "6.2.3-5297ae6" coroutines = null } } diff --git a/gradle.properties b/gradle.properties index 6fd2e9a1..9d46dd8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=me.arasple.mc.trmenu -version=3.6.5 \ No newline at end of file +version=3.6.7 \ No newline at end of file diff --git a/plugin/src/main/kotlin/trplugins/menu/module/conf/Loader.kt b/plugin/src/main/kotlin/trplugins/menu/module/conf/Loader.kt index 48c23d73..8a29ffad 100644 --- a/plugin/src/main/kotlin/trplugins/menu/module/conf/Loader.kt +++ b/plugin/src/main/kotlin/trplugins/menu/module/conf/Loader.kt @@ -3,6 +3,7 @@ package trplugins.menu.module.conf import org.bukkit.Bukkit import org.bukkit.command.CommandSender import taboolib.common.platform.function.console +import taboolib.common.platform.function.getDataFolder import taboolib.common.platform.function.releaseResourceFile import taboolib.module.lang.sendLang import taboolib.platform.util.sendLang @@ -23,7 +24,7 @@ object Loader { private val folder by lazy { Menu.menus.clear() - val folder = File(TrMenu.plugin.dataFolder, "menus") + val folder = File(getDataFolder(), "menus") if (!folder.exists()) { arrayOf(