From 61bcc6a75dc49b132dfbbe0ae78c105943308e57 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 9 Mar 2021 13:25:29 -0500
Subject: [PATCH] Update for 1.16.210

---
 pom.xml                                                  | 7 +++----
 .../java/org/geysermc/connect/GeyserConnectConfig.java   | 2 ++
 src/main/java/org/geysermc/connect/MasterServer.java     | 9 ++++++++-
 src/main/java/org/geysermc/connect/utils/Player.java     | 7 +++++++
 src/main/resources/config.yml                            | 2 ++
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d17af0..23b3b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,11 +71,10 @@
         </dependency>
         <dependency>
             <groupId>com.github.CloudburstMC.Protocol</groupId>
-            <artifactId>bedrock-v422</artifactId>
-            <version>294e7e53b6</version>
+            <artifactId>bedrock-v428</artifactId>
+            <version>42da92f</version>
             <scope>compile</scope>
             <exclusions>
-                <!-- Stay on the older version of Network while it's rewritten -->
                 <exclusion>
                     <groupId>com.nukkitx.network</groupId>
                     <artifactId>raknet</artifactId>
@@ -85,7 +84,7 @@
         <dependency>
             <groupId>com.nukkitx.network</groupId>
             <artifactId>raknet</artifactId>
-            <version>1.6.20</version>
+            <version>1.6.26-20210217.205834-2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java b/src/main/java/org/geysermc/connect/GeyserConnectConfig.java
index a1f97f8..9f3f102 100644
--- a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java
+++ b/src/main/java/org/geysermc/connect/GeyserConnectConfig.java
@@ -52,6 +52,8 @@ public class GeyserConnectConfig {
 
     private String motd;
 
+    private String submotd = "GeyserConnect";
+
     @JsonProperty("welcome-file")
     private String welcomeFile = "welcome.txt";
 
diff --git a/src/main/java/org/geysermc/connect/MasterServer.java b/src/main/java/org/geysermc/connect/MasterServer.java
index ba80ca3..7c01eea 100644
--- a/src/main/java/org/geysermc/connect/MasterServer.java
+++ b/src/main/java/org/geysermc/connect/MasterServer.java
@@ -157,15 +157,22 @@ public class MasterServer {
                 if (GeyserConnector.getInstance() != null) {
                     playerCount += GeyserConnector.getInstance().getPlayers().size();
                 }
+
+                String subMotd = geyserConnectConfig.getSubmotd();
+                if (subMotd == null || subMotd.isEmpty()) {
+                    subMotd = "GeyserConnect";
+                }
+
                 BedrockPong bdPong = new BedrockPong();
                 bdPong.setEdition("MCPE");
                 bdPong.setMotd(geyserConnectConfig.getMotd());
+                bdPong.setSubMotd(subMotd);
                 bdPong.setPlayerCount(playerCount);
                 bdPong.setMaximumPlayerCount(geyserConnectConfig.getMaxPlayers());
                 bdPong.setGameType("Survival");
                 bdPong.setIpv4Port(port);
                 bdPong.setProtocolVersion(BedrockProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion());
-                bdPong.setVersion(null); // Server tries to connect either way and it looks better
+                bdPong.setVersion(BedrockProtocol.DEFAULT_BEDROCK_CODEC.getMinecraftVersion());
                 return bdPong;
             }
 
diff --git a/src/main/java/org/geysermc/connect/utils/Player.java b/src/main/java/org/geysermc/connect/utils/Player.java
index 31e3843..725de67 100644
--- a/src/main/java/org/geysermc/connect/utils/Player.java
+++ b/src/main/java/org/geysermc/connect/utils/Player.java
@@ -134,6 +134,13 @@ public class Player {
         startGamePacket.setEnchantmentSeed(0);
         startGamePacket.setMultiplayerCorrelationId("");
         startGamePacket.setAuthoritativeMovementMode(AuthoritativeMovementMode.CLIENT);
+
+        SyncedPlayerMovementSettings settings = new SyncedPlayerMovementSettings();
+        settings.setMovementMode(AuthoritativeMovementMode.CLIENT);
+        settings.setRewindHistorySize(0);
+        settings.setServerAuthoritativeBlockBreaking(false);
+        startGamePacket.setPlayerMovementSettings(settings);
+        
         startGamePacket.setVanillaVersion("*");
         session.sendPacket(startGamePacket);
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 5d6bc2b..75f55ba 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -19,6 +19,8 @@ max-players: 100
 
 # MOTD to display
 motd: "GeyserConnect Proxy"
+#Sub-MOTD to display. Will be "GeyserConnect" by default if left blank
+submotd: "GeyserConnect"
 
 # Welcome message file, if file exists and is not empty this will show on join
 # This is loaded live so will update without a server restart