From 2c562938c3033d2eccd4e1444329b9934119218f Mon Sep 17 00:00:00 2001
From: Pugdoot <pugmatt@gmail.com>
Date: Tue, 24 Mar 2026 21:03:51 -0400
Subject: (Release) Fix for join error on some setups

---
 serverlist-server/pom.xml                                |  2 +-
 .../pyratron/pugmatt/bedrockconnect/BedrockConnect.java  |  2 +-
 .../pyratron/pugmatt/bedrockconnect/server/Server.java   | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'serverlist-server')

diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml
index 57b58dc..a831297 100644
--- a/serverlist-server/pom.xml
+++ b/serverlist-server/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.cloudburstmc.protocol</groupId>
             <artifactId>bedrock-connection</artifactId>
-            <version>3.0.0.Beta12-20260316.225858-10</version>
+            <version>3.0.0.Beta12-20260324.161234-12</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
index 2a88499..233a071 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
@@ -19,7 +19,7 @@ import java.sql.SQLException;
 import java.util.*;
 
 public class BedrockConnect {
-    private static String release = "1.66";
+    private static String release = "1.66.1";
 
     private static Config config;
     private static Database database;
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java
index 5b52d16..0487a65 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java
@@ -18,6 +18,7 @@ import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
+import io.netty.channel.Channel;
 
 public class Server {
 
@@ -75,6 +76,21 @@ public class Server {
                 .option(RakChannelOption.RAK_PACKET_LIMIT, BedrockConnect.getConfig().getPacketLimit())
                 .option(RakChannelOption.RAK_GLOBAL_PACKET_LIMIT, BedrockConnect.getConfig().getGlobalPacketLimit())
                 .childHandler(new BedrockServerInitializer() {
+                    @Override
+                    protected void preInitChannel(Channel channel) {
+                        try {
+                            int rakVersion = (Integer)channel.config().getOption(RakChannelOption.RAK_PROTOCOL_VERSION);
+                            // Force latest if rakVersion is missing
+                            if (rakVersion == 0) {
+                                rakVersion = 11;
+                            }
+                            channel.config().setOption(RakChannelOption.RAK_PROTOCOL_VERSION, rakVersion);
+                            super.preInitChannel(channel);
+                        } catch(Exception e) {
+                            BedrockConnect.logger.error("Error during preinit", e);
+                        }
+                    }
+
                     @Override
                     protected void initSession(BedrockServerSession session) {
                         session.setPacketHandler(new PacketHandler(session, false));
-- 
cgit v1.2.1