Reset the scoreboard in the configuration stage

GeyserMC · Nov 2, 2024 · d61ad7b · d61ad7b
1 parent 67a1805
commit d61ad7b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/WorldCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/WorldCache.java
@@ -81,7 +81,7 @@ public WorldCache(GeyserSession session) {
         resetTitleTimes(false);
     }
 
-    public void removeScoreboard() {
+    public void resetScoreboard() {
         scoreboard.removeScoreboard();
         scoreboard = new Scoreboard(session);
     }

diff --git a/...org/geysermc/geyser/translator/protocol/java/JavaFinishConfigurationPacketTranslator.java b/...org/geysermc/geyser/translator/protocol/java/JavaFinishConfigurationPacketTranslator.java
@@ -45,5 +45,11 @@ public void translate(GeyserSession session, ClientboundFinishConfigurationPacke
         }
         session.sendUpstreamPacket(playerListPacket);
         session.getEntityCache().removeAllPlayerEntities();
+
+        // while ClientboundLoginPacket holds the level, it doesn't hold the scoreboard.
+        // The ClientboundStartConfigurationPacket indirectly removes the old scoreboard,
+        // and this packet indirectly creates the new one.
+        // This makes this packet a good place to reset the scoreboard.
+        session.getWorldCache().resetScoreboard();
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
@@ -71,8 +71,6 @@ public void translate(GeyserSession session, ClientboundLoginPacket packet) {
                 DimensionUtils.fastSwitchDimension(session, fakeDim);
             }
 
-            session.getWorldCache().removeScoreboard();
-
             // Remove all bossbars
             session.getEntityCache().removeAllBossBars();
             // Remove extra hearts, hunger, etc.