fix(velocity): bossbar refreshing crashing notchian client

Fixes #439
tritonmc · Aug 21, 2024 · a80c7b2 · a80c7b2
1 parent ffd7bc4
commit a80c7b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...on-velocity/src/main/java/com/rexcantor64/triton/velocity/listeners/VelocityListener.java b/...on-velocity/src/main/java/com/rexcantor64/triton/velocity/listeners/VelocityListener.java
@@ -11,6 +11,7 @@
 import com.velocitypowered.api.event.connection.PreLoginEvent;
 import com.velocitypowered.api.event.player.ServerPostConnectEvent;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import lombok.val;
 import net.kyori.adventure.text.Component;
@@ -50,6 +51,11 @@ public void afterServerConnect(ServerPostConnectEvent e) {
             val lp = (VelocityLanguagePlayer) Triton.get().getPlayerManager().get(e.getPlayer().getUniqueId());
             VelocityTriton.asVelocity().getBridgeManager().sendPlayerLanguage(lp);
 
+            if (lp.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_3) > 0) {
+                // On 1.20.6 and above, the notchian client crashes if a bossbar that does not exist client-side is updated
+                lp.clearCachedBossbars();
+            }
+
             if (Triton.get().getConf().isRunLanguageCommandsOnLogin()) {
                 lp.executeCommands(serverConnection.getServer());
             }

diff --git a/...velocity/src/main/java/com/rexcantor64/triton/velocity/player/VelocityLanguagePlayer.java b/...velocity/src/main/java/com/rexcantor64/triton/velocity/player/VelocityLanguagePlayer.java
@@ -69,6 +69,10 @@ Map<UUID, Component> getCachedBossBars() {
         return Collections.unmodifiableMap(bossBars);
     }
 
+    public void clearCachedBossbars() {
+        bossBars.clear();
+    }
+
     public void cachePlayerListItem(UUID uuid, Component lastDisplayName) {
         playerListItemCache.put(uuid, lastDisplayName);
     }