From f2550de6332af99b59e423ea540b50114d387391 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:57:18 -0500
Subject: [PATCH] Ping/MOTD changes required for 1.16.210.59 (#1931)

---
 .../connector/network/ConnectorServerEventHandler.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java b/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
index b4a0ddb69..70fe26357 100644
--- a/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
+++ b/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
@@ -69,10 +69,10 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
 
         BedrockPong pong = new BedrockPong();
         pong.setEdition("MCPE");
-        pong.setGameType("Default");
+        pong.setGameType("Survival"); // Can only be Survival or Creative as of 1.16.210.59
         pong.setNintendoLimited(false);
         pong.setProtocolVersion(BedrockProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion());
-        pong.setVersion(null); // Server tries to connect either way and it looks better
+        pong.setVersion(BedrockProtocol.DEFAULT_BEDROCK_CODEC.getMinecraftVersion()); // Required to not be empty as of 1.16.210.59
         pong.setIpv4Port(config.getBedrock().getPort());
 
         if (config.isPassthroughMotd() && pingInfo != null && pingInfo.getDescription() != null) {