Skip to content

Commit c573ce5

Browse files
authored
Merge pull request #616 from YsGqHY/dev/6.2.3-dev
feat(bukkit-nms): 支持 Folia 的捕获玩家牌子输入
2 parents 9c8cbc0 + 1e0d07a commit c573ce5

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

module/bukkit-nms/bukkit-nms-stable/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
compileOnly(project(":module:bukkit:bukkit-util"))
1111
// 测试用
1212
compileOnly(project(":platform:platform-bukkit-impl"))
13+
compileOnly(project(":platform:platform-bukkit"))
1314
compileOnly(project(":module:bukkit-nms"))
1415
// 服务端
1516
compileOnly("net.md-5:bungeecord-chat:1.17")
@@ -22,6 +23,7 @@ dependencies {
2223
compileOnly("com.mojang:brigadier:1.0.18")
2324
// DataSerializer
2425
compileOnly("io.netty:netty-all:4.1.73.Final")
26+
compileOnly("io.paper:folia-api:1.20.4")
2527
}
2628

2729
tasks {

module/bukkit-nms/bukkit-nms-stable/src/main/kotlin/taboolib/module/nms/NMSSign.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ import taboolib.common.platform.PlatformSide
1010
import taboolib.common.platform.event.SubscribeEvent
1111
import taboolib.common.platform.function.submit
1212
import taboolib.common.util.unsafeLazy
13+
import taboolib.platform.BukkitPlugin
14+
import taboolib.platform.Folia
15+
import taboolib.platform.FoliaExecutor
1316
import java.lang.reflect.Constructor
1417
import java.util.concurrent.ConcurrentHashMap
1518

@@ -134,7 +137,13 @@ private object NMSSignListener {
134137
MinecraftVersion.isHigherOrEqual(MinecraftVersion.V1_9) -> e.packet.read<Array<String>>("b")!!
135138
else -> e.packet.read<Array<Any>>("b")!!.map { nmsProxy<NMSSign>().deserialize(it) }.toTypedArray()
136139
}
137-
submit { function.invoke(lines) }
140+
if (Folia.isFolia) {
141+
FoliaExecutor.REGION_SCHEDULER.run(BukkitPlugin.getInstance(), e.player.location) {
142+
function.invoke(lines)
143+
}
144+
} else {
145+
submit { function.invoke(lines) }
146+
}
138147
}
139148
}
140149
}

0 commit comments

Comments
 (0)