Ensure tick thread for heal/feed command

Author: Rothes

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/essentialcommands/Feed.kt

@@ -3,6 +3,7 @@ package io.github.rothes.esu.bukkit.module.essentialcommands
 import io.github.rothes.esu.bukkit.user
 import io.github.rothes.esu.bukkit.user.PlayerUser
 import io.github.rothes.esu.bukkit.util.ComponentBukkitUtils.player
+import io.github.rothes.esu.bukkit.util.scheduler.Scheduler.syncTick
 import io.github.rothes.esu.core.command.annotation.ShortPerm
 import io.github.rothes.esu.core.configuration.data.MessageData
 import io.github.rothes.esu.core.configuration.data.MessageData.Companion.message
@@ -26,12 +27,14 @@ object Feed : BaseCommand<FeatureToggle.DefaultTrue, Feed.Lang>() {
             @Command("feed <player>")
             @ShortPerm("others")
             fun feed(sender: User, player: Player, @Flag("silent") silent: Boolean = sender.uuid != player.uniqueId) {
-                player.foodLevel = 20
-                player.saturation = 20.0f // 5.0f on respawn
-                player.exhaustion = 0.0f
-                sender.message(lang, { fedPlayer }, player(player))
-                if (!silent) {
-                    player.user.message(lang, { fed })
+                player.syncTick {
+                    player.foodLevel = 20
+                    player.saturation = 20.0f // 5.0f on respawn
+                    player.exhaustion = 0.0f
+                    sender.message(lang, { fedPlayer }, player(player))
+                    if (!silent) {
+                        player.user.message(lang, { fed })
+                    }
                 }
             }
         })

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/essentialcommands/Heal.kt

@@ -3,6 +3,7 @@ package io.github.rothes.esu.bukkit.module.essentialcommands
 import io.github.rothes.esu.bukkit.user
 import io.github.rothes.esu.bukkit.user.PlayerUser
 import io.github.rothes.esu.bukkit.util.ComponentBukkitUtils.player
+import io.github.rothes.esu.bukkit.util.scheduler.Scheduler.syncTick
 import io.github.rothes.esu.bukkit.util.version.adapter.AttributeAdapter
 import io.github.rothes.esu.core.command.annotation.ShortPerm
 import io.github.rothes.esu.core.configuration.data.MessageData
@@ -27,10 +28,12 @@ object Heal : BaseCommand<FeatureToggle.DefaultTrue, Heal.Lang>() {
             @Command("heal <player>")
             @ShortPerm("others")
             fun heal(sender: User, player: Player, @Flag("silent") silent: Boolean = sender.uuid != player.uniqueId) {
-                player.heal(player.getAttribute(AttributeAdapter.MAX_HEALTH)!!.value)
-                sender.message(lang, { healedPlayer }, player(player))
-                if (!silent) {
-                    player.user.message(lang, { healed })
+                player.syncTick {
+                    player.heal(player.getAttribute(AttributeAdapter.MAX_HEALTH)!!.value)
+                    sender.message(lang, { healedPlayer }, player(player))
+                    if (!silent) {
+                        player.user.message(lang, { healed })
+                    }
                 }
             }
         })

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/util/scheduler/Scheduler.kt

@@ -1,6 +1,7 @@
 package io.github.rothes.esu.bukkit.util.scheduler
 
 import io.github.rothes.esu.bukkit.util.ServerCompatibility.isFolia
+import io.github.rothes.esu.bukkit.util.version.adapter.TickThreadAdapter.Companion.checkTickThread
 import kotlinx.coroutines.CompletableDeferred
 import org.bukkit.Bukkit
 import org.bukkit.Location
@@ -120,6 +121,13 @@ object Scheduler {
         return schedule(this, plugin, func)
     }
 
+    fun Entity.syncTick(plugin: Plugin = esuPlugin, func: () -> Unit) {
+        if (checkTickThread())
+            func()
+        else
+            schedule(this, plugin, func)
+    }
+
     fun cancelTasks(plugin: Plugin = esuPlugin) {
         if (isFolia) {
             Bukkit.getGlobalRegionScheduler().cancelTasks(plugin)