Fix #67 - Use an enum for the display objective packet on 1.20.2

r4g3baby · Oct 12, 2023 · 8d2ed3e · 8d2ed3e
1 parent 328168c
commit 8d2ed3e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/kotlin/com/r4g3baby/simplescore/scoreboard/handlers/ProtocolScoreboard.kt b/src/main/kotlin/com/r4g3baby/simplescore/scoreboard/handlers/ProtocolScoreboard.kt
@@ -10,15 +10,18 @@ import com.comphenix.protocol.wrappers.WrappedChatComponent.fromLegacyText
 import com.comphenix.protocol.wrappers.WrappedChatComponent.fromText
 import com.r4g3baby.simplescore.scoreboard.models.PlayerBoard
 import org.bukkit.entity.Player
+import org.bukkit.scoreboard.DisplaySlot
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
+
 class ProtocolScoreboard : ScoreboardHandler() {
     private val protocolManager = ProtocolLibrary.getProtocolManager()
 
     // Don't use ProtocolLib version enums, so we can support older plugin versions
     private val afterAquaticUpdate = MinecraftVersion("1.13").atOrAbove()
     private val afterCavesAndCliffsUpdate = MinecraftVersion("1.17").atOrAbove()
+    private val afterTrailsAndTailsDot2Update = MinecraftVersion("1.20.2").atOrAbove()
 
     private val playerBoards = ConcurrentHashMap(HashMap<UUID, PlayerBoard>())
 
@@ -35,7 +38,9 @@ class ProtocolScoreboard : ScoreboardHandler() {
 
             packet = PacketContainer(PacketType.Play.Server.SCOREBOARD_DISPLAY_OBJECTIVE)
             packet.modifier.writeDefaults()
-            packet.integers.write(0, 1) // Position 1: Sidebar
+            if (afterTrailsAndTailsDot2Update) {
+                packet.getEnumModifier(DisplaySlot::class.java, 0).write(0, DisplaySlot.SIDEBAR)
+            } else packet.integers.write(0, 1) // Position 1: Sidebar
             packet.strings.write(0, getPlayerIdentifier(player)) // Objective Name
             protocolManager.sendServerPacket(player, packet)
 

diff --git a/src/main/kotlin/com/r4g3baby/simplescore/scoreboard/listeners/PacketListener.kt b/src/main/kotlin/com/r4g3baby/simplescore/scoreboard/listeners/PacketListener.kt
@@ -5,6 +5,7 @@ import com.comphenix.protocol.ProtocolLibrary
 import com.comphenix.protocol.events.ListeningWhitelist
 import com.comphenix.protocol.events.PacketEvent
 import com.comphenix.protocol.events.PacketListener
+import com.comphenix.protocol.utility.MinecraftVersion
 import com.r4g3baby.simplescore.SimpleScore
 import com.r4g3baby.simplescore.scoreboard.handlers.ScoreboardHandler.Companion.getPlayerIdentifier
 import com.r4g3baby.simplescore.scoreboard.models.CompatibilityMode
@@ -13,13 +14,16 @@ import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerQuitEvent
 import org.bukkit.plugin.Plugin
+import org.bukkit.scoreboard.DisplaySlot
 
 class PacketListener : PacketListener, Listener {
     private val protocolLibPlugin = ProtocolLibrary.getPlugin()
     private val sendingPackets = ListeningWhitelist.newBuilder().highest().types(
         PacketType.Play.Server.SCOREBOARD_OBJECTIVE, PacketType.Play.Server.SCOREBOARD_DISPLAY_OBJECTIVE
     ).build()
 
+    private val afterTrailsAndTailsDot2Update = MinecraftVersion("1.20.2").atOrAbove()
+
     override fun getSendingWhitelist(): ListeningWhitelist {
         return sendingPackets
     }
@@ -30,7 +34,9 @@ class PacketListener : PacketListener, Listener {
         when (SimpleScore.config.compatibilityMode) {
             CompatibilityMode.DISABLE -> {
                 if (e.packet.type == PacketType.Play.Server.SCOREBOARD_DISPLAY_OBJECTIVE) {
-                    val position = e.packet.integers.read(0)
+                    val position = if (afterTrailsAndTailsDot2Update) {
+                        e.packet.getEnumModifier(DisplaySlot::class.java, 0).read(0).ordinal - 1
+                    } else e.packet.integers.read(0)
                     val name = e.packet.strings.read(0)
                     if (position == 1 && name != getPlayerIdentifier(e.player)) {
                         SimpleScore.manager.playersData.setDisabled(protocolLibPlugin, e.player, true)
@@ -47,7 +53,9 @@ class PacketListener : PacketListener, Listener {
             }
             CompatibilityMode.BLOCK -> {
                 if (e.packet.type == PacketType.Play.Server.SCOREBOARD_DISPLAY_OBJECTIVE) {
-                    val position = e.packet.integers.read(0)
+                    val position = if (afterTrailsAndTailsDot2Update) {
+                        e.packet.getEnumModifier(DisplaySlot::class.java, 0).read(0).ordinal - 1
+                    } else e.packet.integers.read(0)
                     val name = e.packet.strings.read(0)
                     if (position == 1 && name != getPlayerIdentifier(e.player)) {
                         e.isCancelled = SimpleScore.manager.needsScoreboard(e.player)