Skip to content

Fix tick thread for hitboxes on Folia #422

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

Open
Jsinco wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

Fix tick thread for hitboxes on Folia #422

Show file tree
Hide file tree
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
25 changes: 19 additions & 6 deletions nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R3/HitBoxImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import io.papermc.paper.event.entity.EntityKnockbackEvent
import kr.toxicity.model.api.BetterModel
import kr.toxicity.model.api.bone.BoneMovement
import kr.toxicity.model.api.bone.RenderedBone
import kr.toxicity.model.api.bukkit.BetterModelBukkit
import kr.toxicity.model.api.config.DebugConfig
import kr.toxicity.model.api.data.blueprint.ModelBoundingBox
import kr.toxicity.model.api.event.hitbox.*
Expand Down Expand Up @@ -318,17 +319,29 @@ internal class HitBoxImpl(

override fun hide(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
}
}
}

override fun show(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
}
}
}

private fun runVisibilityTask(plugin: Plugin, task: () -> Unit) {
if (!BetterModelBukkit.IS_FOLIA || Bukkit.isOwnedByCurrentRegion(bukkitEntity)) {
task()
} else {
bukkitEntity.scheduler.run(plugin, { task() }, null)
}
}

Expand Down
24 changes: 18 additions & 6 deletions nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R4/HitBoxImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,17 +326,29 @@ internal class HitBoxImpl(

override fun hide(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
}
}
}

override fun show(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
}
}
}

private fun runVisibilityTask(plugin: Plugin, task: () -> Unit) {
if (!BetterModelBukkit.IS_FOLIA || Bukkit.isOwnedByCurrentRegion(bukkitEntity)) {
task()
} else {
bukkitEntity.scheduler.run(plugin, { task() }, null)
}
}

Expand Down
24 changes: 18 additions & 6 deletions nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R5/HitBoxImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,29 @@ internal class HitBoxImpl(

override fun hide(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
}
}
}

override fun show(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
}
}
}

private fun runVisibilityTask(plugin: Plugin, task: () -> Unit) {
if (!BetterModelBukkit.IS_FOLIA || Bukkit.isOwnedByCurrentRegion(bukkitEntity)) {
task()
} else {
bukkitEntity.scheduler.run(plugin, { task() }, null)
}
}

Expand Down
24 changes: 18 additions & 6 deletions nms/v1_21_R6/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R6/HitBoxImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,29 @@ internal class HitBoxImpl(

override fun hide(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
}
}
}

override fun show(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
}
}
}

private fun runVisibilityTask(plugin: Plugin, task: () -> Unit) {
if (!BetterModelBukkit.IS_FOLIA || Bukkit.isOwnedByCurrentRegion(bukkitEntity)) {
task()
} else {
bukkitEntity.scheduler.run(plugin, { task() }, null)
}
}

Expand Down
24 changes: 18 additions & 6 deletions nms/v1_21_R7/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R7/HitBoxImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,29 @@ internal class HitBoxImpl(

override fun hide(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
}
}
}

override fun show(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
}
}
}

private fun runVisibilityTask(plugin: Plugin, task: () -> Unit) {
if (!BetterModelBukkit.IS_FOLIA || Bukkit.isOwnedByCurrentRegion(bukkitEntity)) {
task()
} else {
bukkitEntity.scheduler.run(plugin, { task() }, null)
}
}

Expand Down
24 changes: 18 additions & 6 deletions nms/v26_R1/src/main/kotlin/kr/toxicity/model/bukkit/nms/v26_R1/HitBoxImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,29 @@ internal class HitBoxImpl(

override fun hide(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
}
}
}

override fun show(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
}
}
}

private fun runVisibilityTask(plugin: Plugin, task: () -> Unit) {
if (!BetterModelBukkit.IS_FOLIA || Bukkit.isOwnedByCurrentRegion(bukkitEntity)) {
task()
} else {
bukkitEntity.scheduler.run(plugin, { task() }, null)
}
}

Expand Down
24 changes: 18 additions & 6 deletions nms/v26_R2/src/main/kotlin/kr/toxicity/model/bukkit/nms/v26_R2/HitBoxImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,17 +330,29 @@ internal class HitBoxImpl(

override fun hide(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
hideEntity(plugin, bukkitEntity)
hideEntity(plugin, interaction.bukkitEntity)
}
}
}

override fun show(player: PlatformPlayer) {
val plugin = BetterModel.platform() as Plugin
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
runVisibilityTask(plugin) {
player.unwarp().run {
showEntity(plugin, bukkitEntity)
showEntity(plugin, interaction.bukkitEntity)
}
}
}

private fun runVisibilityTask(plugin: Plugin, task: () -> Unit) {
if (!BetterModelBukkit.IS_FOLIA || Bukkit.isOwnedByCurrentRegion(bukkitEntity)) {
task()
} else {
bukkitEntity.scheduler.run(plugin, { task() }, null)
}
}

Expand Down