[6.2.0] 调整 AppConsole#sendMessage 函数，调整记分板逻辑

TabooLib · Oct 23, 2024 · 524d729 · 524d729
1 parent 3a49e58
commit 524d729
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=taboolib
-version=6.2.0-beta21
+version=6.2.0-beta22
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true

diff --git a/module/bukkit-nms/bukkit-nms-stable/src/main/kotlin/taboolib/module/nms/NMSScoreboard.kt b/module/bukkit-nms/bukkit-nms-stable/src/main/kotlin/taboolib/module/nms/NMSScoreboard.kt
@@ -520,25 +520,13 @@ class NMSScoreboardImpl : NMSScoreboard() {
                     player.sendPacket(PacketPlayOutScoreboardScore::class.java.invokeConstructor(uniqueOwner[i], objectiveName, i, null, null))
                     return@forEach
                 }
-                // 1.20.1, 1.20.2
-                if (MinecraftVersion.majorLegacy > 12000) {
-                    player.sendPacket(
-                        net.minecraft.server.v1_16_R3.PacketPlayOutScoreboardScore(
-                            net.minecraft.server.v1_16_R3.ScoreboardServer.Action.CHANGE,
-                            objectiveName,
-                            uniqueOwner[i], // 麻将小天才
-                            i
-                        )
-                    )
-                    return@forEach
-                }
                 // 1.13+ 直接实例化
                 if (MinecraftVersion.isHigherOrEqual(MinecraftVersion.V1_13)) {
                     player.sendPacket(
                         net.minecraft.server.v1_16_R3.PacketPlayOutScoreboardScore(
                             net.minecraft.server.v1_16_R3.ScoreboardServer.Action.CHANGE,
-                            uniqueOwner[i],
                             objectiveName,
+                            uniqueOwner[i],
                             i
                         )
                     )

diff --git a/platform/platform-application/src/main/kotlin/taboolib/platform/AppConsole.kt b/platform/platform-application/src/main/kotlin/taboolib/platform/AppConsole.kt
@@ -110,6 +110,11 @@ object AppConsole : SimpleTerminalConsole(), ProxyCommandSender {
     }
 
     override fun sendMessage(message: String) {
-        info(message)
+        // 移除颜色代码
+        if (message.contains("§")) {
+            info(message.replace("§[0-9a-fA-F]", ""))
+        } else {
+            info(message)
+        }
     }
 }