Skip to content

Commit d00bd20

Browse files
committed
Fix extension reporting wrong version information
This caused an issue with bedrock 1.21 prior to this change
1 parent 6fe0064 commit d00bd20

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

bootstrap/geyser/src/main/java/com/rtm516/mcxboxbroadcast/bootstrap/geyser/MCXboxBroadcastExtension.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.geysermc.geyser.api.event.lifecycle.GeyserDefineCommandsEvent;
1414
import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent;
1515
import org.geysermc.geyser.api.extension.Extension;
16+
import org.geysermc.geyser.api.util.MinecraftVersion;
1617

1718
import java.io.IOException;
1819
import java.net.InetAddress;
@@ -136,12 +137,14 @@ public void onPostInitialize(GeyserPostInitializeEvent event) {
136137
port = Integer.parseInt(config.remotePort());
137138
}
138139

140+
MinecraftVersion latestVersion = this.geyserApi().supportedBedrockVersions().get(this.geyserApi().supportedBedrockVersions().size() - 1);
141+
139142
// Create the session information based on the Geyser config
140143
sessionInfo = new SessionInfo();
141144
sessionInfo.setHostName(this.geyserApi().bedrockListener().primaryMotd());
142145
sessionInfo.setWorldName(this.geyserApi().bedrockListener().secondaryMotd());
143-
sessionInfo.setVersion(this.geyserApi().defaultRemoteServer().minecraftVersion());
144-
sessionInfo.setProtocol(this.geyserApi().defaultRemoteServer().protocolVersion());
146+
sessionInfo.setVersion(latestVersion.versionString());
147+
sessionInfo.setProtocol(latestVersion.protocolVersion());
145148
sessionInfo.setPlayers(this.geyserApi().onlineConnections().size());
146149
sessionInfo.setMaxPlayers(GeyserImpl.getInstance().getConfig().getMaxPlayers()); // TODO Find API equivalent
147150

gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[versions]
22
bedrock-common = "2.9.17-SNAPSHOT"
3-
geyser ="2.1.2-SNAPSHOT"
4-
floodgate ="2.2.2-SNAPSHOT"
3+
geyser ="2.3.1-SNAPSHOT"
54
jackson = "2.14.0"
65
java-websocket = "1.5.3"
76
nimbus-jose-jwt = "9.23"

0 commit comments

Comments
 (0)