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

Only enable the locator bar when we're certain the Java server wants us to

Browse Source
This commit is contained in:
onebeastchris
2025-06-26 00:34:46 +02:00
parent 473cd0bb97
commit 868fed172e
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View File

@@ -867,6 +867,10 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
gamerulePacket.getGameRules().add(new GameRuleData<>("spawnradius", 0)); gamerulePacket.getGameRules().add(new GameRuleData<>("spawnradius", 0));
// Recipe unlocking // Recipe unlocking
gamerulePacket.getGameRules().add(new GameRuleData<>("recipesunlock", true)); gamerulePacket.getGameRules().add(new GameRuleData<>("recipesunlock", true));
// We disable the locator bar until we are certain that the server wants us to enable it
// See WaypointCache for details
gamerulePacket.getGameRules().add(new GameRuleData<>("locatorBar", false));
upstream.sendPacket(gamerulePacket); upstream.sendPacket(gamerulePacket);
} }

5
core/src/main/java/org/geysermc/geyser/session/cache/waypoint/WaypointCache.java vendored
View File

@@ -175,4 +175,9 @@ public final class WaypointCache {
addPacket.getEntries().add(entry); addPacket.getEntries().add(entry);
session.sendUpstreamPacket(addPacket); session.sendUpstreamPacket(addPacket);
} }
public void clear() {
waypoints.clear();
session.sendGameRule("locatorBar", false);
}
} }

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

@@ -83,6 +83,9 @@ public class JavaLoginTranslator extends PacketTranslator<ClientboundLoginPacket
session.setInventoryHolder(null); session.setInventoryHolder(null);
session.setPendingOrCurrentBedrockInventoryId(-1); session.setPendingOrCurrentBedrockInventoryId(-1);
session.setClosingInventory(false); session.setClosingInventory(false);
// Clear waypoints
session.getWaypointCache().clear();
} }
session.setDimensionType(newDimension); session.setDimensionType(newDimension);