Skip to content

Commit a1abd59

Browse files
committed
refactor(nms): 将混合服务端检测细化为仅检测CatServer
1 parent bafb19b commit a1abd59

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

module/bukkit-nms/src/main/kotlin/taboolib/module/nms/MinecraftVersion.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ object MinecraftVersion {
6363
get() = minecraftVersion == "UNKNOWN"
6464

6565
/**
66-
* 是否为混合服务端(如 CatServer、Mohist、Arclight、Magma 等)
66+
* 是否为CatServer
6767
* 这些服务端使用自己的重混淆系统,可能与 Taboolib 的 NMS 重映射不兼容
6868
*/
69-
val isHybridServer by unsafeLazy {
69+
val isCatServer by unsafeLazy {
7070
try {
7171
// 检测 CatServer
7272
Class.forName("catserver.server.CatServer")

module/bukkit-nms/src/main/kotlin/taboolib/module/nms/PacketSender.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ object PacketSender {
6868
val connection = getConnection(player)
6969
if (sendPacketMethod == null) {
7070
// 在混合服务端下,直接使用原生反射避免触发类型加载
71-
if (MinecraftVersion.isHybridServer) {
71+
if (MinecraftVersion.isCatServer) {
7272
sendPacketMethod = getSendPacketMethodHybrid(connection, packet)
7373
isFallbackMethod = true
7474
} else {
@@ -147,7 +147,7 @@ object PacketSender {
147147
"Failed to find sendPacket method. " +
148148
"Connection type: ${connectionClass.name}, " +
149149
"Packet type: ${packet.javaClass.name}, " +
150-
"Server: ${if (MinecraftVersion.isHybridServer) "Hybrid Server" else "Standard Server"}"
150+
"Server: ${if (MinecraftVersion.isCatServer) "Hybrid Server" else "Standard Server"}"
151151
)
152152
}
153153

@@ -158,7 +158,7 @@ object PacketSender {
158158
return if (playerConnectionMap.containsKey(player.name)) {
159159
playerConnectionMap[player.name]!!
160160
} else {
161-
val connection = if (!MinecraftVersion.isHybridServer) {
161+
val connection = if (!MinecraftVersion.isCatServer) {
162162
// 标准方式获取连接
163163
if (MinecraftVersion.isUniversal) {
164164
player.getProperty<Any>("entity/connection")!!
@@ -235,7 +235,7 @@ object PacketSender {
235235
// 还找不到就真没招了
236236
throw RuntimeException(
237237
"Failed to get player connection. " +
238-
"Server: ${if (MinecraftVersion.isHybridServer) "Hybrid Server" else "Standard Server"}, " +
238+
"Server: ${if (MinecraftVersion.isCatServer) "Hybrid Server" else "Standard Server"}, " +
239239
"Version: ${MinecraftVersion.runningVersion}"
240240
)
241241
}

0 commit comments

Comments
 (0)