OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-22 06:46:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix loom usage, and disconnect messages for all outdated clients (#5006)

Browse source
This commit is contained in:
Konicai 2024-08-29 14:50:26 -04:00 committed by GitHub
parent 8356b63f5d
commit 1b17c6bd8e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
View file

@ -120,10 +120,11 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
session.disconnect(disconnectMessage); session.disconnect(disconnectMessage);
return false; return false;
} else if (protocolVersion < GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) { } else if (protocolVersion < GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) {
if (protocolVersion < Bedrock_v622.CODEC.getProtocolVersion()) { // A note on the following line: various older client versions have different forms of DisconnectPacket.
// https://github.com/GeyserMC/Geyser/issues/4378 // Using only the latest BedrockCompat for such clients leads to inaccurate disconnect messages: https://github.com/GeyserMC/Geyser/issues/4378
session.getUpstream().getSession().setCodec(BedrockCompat.CODEC_LEGACY); // This updates the BedrockCompat protocol if necessary:
} session.getUpstream().getSession().setCodec(BedrockCompat.disconnectCompat(protocolVersion));
session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.client", supportedVersions)); session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.client", supportedVersions));
return false; return false;
} else { } else {

6
gradle/libs.versions.toml
View file

@ -10,9 +10,9 @@ netty-io-uring = "0.0.25.Final-SNAPSHOT"
guava = "29.0-jre" guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8 gson = "2.3.1" # Provided by Spigot 1.8.8
websocket = "1.5.1" websocket = "1.5.1"
protocol-connection = "3.0.0.Beta3-20240819.124045-12" protocol-connection = "3.0.0.Beta4-20240828.162251-1"
protocol-common = "3.0.0.Beta3-20240819.124045-10" protocol-common = "3.0.0.Beta4-20240828.162251-1"
protocol-codec = "3.0.0.Beta3-20240819.124045-13" protocol-codec = "3.0.0.Beta4-20240828.162251-1"
raknet = "1.0.0.CR3-20240416.144209-1" raknet = "1.0.0.CR3-20240416.144209-1"
minecraftauth = "4.1.1-20240806.235051-7" minecraftauth = "4.1.1-20240806.235051-7"
mcprotocollib = "1.21-20240725.013034-16" mcprotocollib = "1.21-20240725.013034-16"