Skip to content

Commit e4c1140

Browse files
committed
Update protocol to resolve more client crashes on 1.21.130, re-enable commands, bump version
1 parent bc82147 commit e4c1140

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ PacketSignal defaultHandler(BedrockPacket packet) {
119119

120120
private boolean setCorrectCodec(int protocolVersion) {
121121
BedrockCodec packetCodec = GameProtocol.getBedrockCodec(protocolVersion);
122-
// temp fix allowing 1.21.130 preview to join
123-
if (protocolVersion == 897) {
124-
packetCodec = GameProtocol.getBedrockCodec(898);
125-
}
126122
if (packetCodec == null) {
127123
// None of our Bedrock codecs support this client version, so we can simply compare it to our default protocol.
128124
String supportedVersions = GameProtocol.getAllSupportedBedrockVersions();

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.geysermc.geyser.api.event.java.ServerDefineCommandsEvent;
4444
import org.geysermc.geyser.api.util.PlatformType;
4545
import org.geysermc.geyser.command.CommandRegistry;
46-
import org.geysermc.geyser.network.GameProtocol;
4746
import org.geysermc.geyser.registry.BlockRegistries;
4847
import org.geysermc.geyser.registry.Registries;
4948
import org.geysermc.geyser.session.GeyserSession;
@@ -124,7 +123,7 @@ public boolean equals(BedrockCommandInfo a, BedrockCommandInfo b) {
124123
@Override
125124
public void translate(GeyserSession session, ClientboundCommandsPacket packet) {
126125
// Don't send command suggestions if they are disabled
127-
if (GameProtocol.is1_21_130orHigher(session.protocolVersion()) || !session.getGeyser().config().gameplay().commandSuggestions()) {
126+
if (!session.getGeyser().config().gameplay().commandSuggestions()) {
128127
session.getGeyser().getLogger().debug("Not sending translated command suggestions as they are disabled.");
129128

130129
// Send a mostly empty packet so Bedrock doesn't override /help with its own, built-in help command.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ org.gradle.vfs.watch=false
88

99
group=org.geysermc
1010
id=geyser
11-
version=2.9.1-SNAPSHOT
11+
version=2.9.2-SNAPSHOT
1212
description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ guava = "29.0-jre"
1313
gson = "2.3.1" # Provided by Spigot 1.8.8 TODO bump to 2.8.1 or similar (Spigot 1.16.5 version) after Merge
1414
gson-runtime = "2.10.1"
1515
websocket = "1.5.1"
16-
protocol-connection = "3.0.0.Beta11-20251209.183710-13"
17-
protocol-common = "3.0.0.Beta11-20251209.183710-12"
18-
protocol-codec = "3.0.0.Beta11-20251209.183710-13"
16+
protocol-connection = "3.0.0.Beta11-20251210.195537-15"
17+
protocol-common = "3.0.0.Beta11-20251210.195537-14"
18+
protocol-codec = "3.0.0.Beta11-20251210.195537-15"
1919
raknet = "1.0.0.CR3-20251208.214317-23"
2020
minecraftauth = "5.0.0"
2121
mcprotocollib = "1.21.9-20251029.184056-18"

0 commit comments

Comments
 (0)