minecraft: Read serverSubName from index 7 & append trailing 0 to pon…

…g data (#231)
Sandertv · Aug 2, 2024 · 1d84b30 · 1d84b30
1 parent 39e4906
commit 1d84b30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/minecraft/listener.go b/minecraft/listener.go
@@ -210,9 +210,10 @@ func (listener *Listener) Close() error {
 // server name of the listener, provided the listener isn't currently hijacking the pong of another server.
 func (listener *Listener) updatePongData() {
 	s := listener.status()
-	listener.listener.PongData([]byte(fmt.Sprintf("MCPE;%v;%v;%v;%v;%v;%v;%s;%v;%v;%v;%v;",
+	listener.listener.PongData([]byte(fmt.Sprintf("MCPE;%v;%v;%v;%v;%v;%v;%v;%v;%v;%v;%v;%v;",
 		s.ServerName, protocol.CurrentProtocol, protocol.CurrentVersion, s.PlayerCount, s.MaxPlayers,
-		listener.listener.ID(), listener.status().ServerSubName, "Creative", 1, listener.Addr().(*net.UDPAddr).Port, listener.Addr().(*net.UDPAddr).Port,
+		listener.listener.ID(), s.ServerSubName, "Creative", 1, listener.Addr().(*net.UDPAddr).Port, listener.Addr().(*net.UDPAddr).Port,
+		0,
 	)))
 }
 

diff --git a/minecraft/server_status_provider.go b/minecraft/server_status_provider.go
@@ -126,7 +126,7 @@ func parsePongData(pong []byte) ServerStatus {
 		return ServerStatus{ServerName: "Invalid pong data"}
 	}
 	serverName := frag[1]
-	serverSubName := frag[6]
+	serverSubName := frag[7]
 	online, err := strconv.Atoi(frag[4])
 	if err != nil {
 		return ServerStatus{ServerName: "Invalid player count"}