GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-20 07:19:29 +00:00
Code Issues Releases Activity

Reset the scoreboard in the configuration stage

Browse Source
This commit is contained in:
Tim203
2024-11-02 11:48:58 +01:00
parent 67a1805fa6
commit d61ad7baef
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/session/cache/WorldCache.java vendored
View File

@@ -81,7 +81,7 @@ public final class WorldCache {
resetTitleTimes(false); resetTitleTimes(false);
} }
public void removeScoreboard() { public void resetScoreboard() {
scoreboard.removeScoreboard(); scoreboard.removeScoreboard();
scoreboard = new Scoreboard(session); scoreboard = new Scoreboard(session);
} }

6
core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaFinishConfigurationPacketTranslator.java
View File

@@ -45,5 +45,11 @@ public class JavaFinishConfigurationPacketTranslator extends PacketTranslator<Cl
} }
session.sendUpstreamPacket(playerListPacket); session.sendUpstreamPacket(playerListPacket);
session.getEntityCache().removeAllPlayerEntities(); 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();
} }
} }

2
core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
View File

@@ -71,8 +71,6 @@ public class JavaLoginTranslator extends PacketTranslator<ClientboundLoginPacket
DimensionUtils.fastSwitchDimension(session, fakeDim); DimensionUtils.fastSwitchDimension(session, fakeDim);
} }
session.getWorldCache().removeScoreboard();
// Remove all bossbars // Remove all bossbars
session.getEntityCache().removeAllBossBars(); session.getEntityCache().removeAllBossBars();
// Remove extra hearts, hunger, etc. // Remove extra hearts, hunger, etc.