From f71fa9ccacec8b56e49fa2037877b704898111c6 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sun, 18 Sep 2022 15:18:48 -0400
Subject: [PATCH] Only check for correct protocol version once

---
 .../geyser/network/UpstreamPacketHandler.java | 39 +++++++++++++------
 settings.gradle.kts                           |  3 ++
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
index 286a2eb9b..c2a91fd75 100644
--- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -62,8 +62,34 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
         return translateAndDefault(packet);
     }
 
+    private boolean newProtocol = false; // TEMPORARY
+
+    private boolean setCorrectCodec(int protocolVersion) {
+        BedrockPacketCodec packetCodec = GameProtocol.getBedrockCodec(protocolVersion);
+        if (packetCodec == null) {
+            String supportedVersions = GameProtocol.getAllSupportedBedrockVersions();
+            if (protocolVersion > GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) {
+                // Too early to determine session locale
+                session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.server", supportedVersions));
+                return false;
+            } else if (protocolVersion < GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) {
+                session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.client", supportedVersions));
+                return false;
+            }
+        }
+
+        session.getUpstream().getSession().setPacketCodec(packetCodec);
+        return true;
+    }
+
     @Override
     public boolean handle(RequestNetworkSettingsPacket packet) {
+        if (setCorrectCodec(packet.getProtocolVersion())) {
+            newProtocol = true;
+        } else {
+            return true;
+        }
+
         // New since 1.19.30 - sent before login packet
         PacketCompressionAlgorithm algorithm = PacketCompressionAlgorithm.ZLIB;
 
@@ -84,21 +110,12 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
             return true;
         }
 
-        BedrockPacketCodec packetCodec = GameProtocol.getBedrockCodec(loginPacket.getProtocolVersion());
-        if (packetCodec == null) {
-            String supportedVersions = GameProtocol.getAllSupportedBedrockVersions();
-            if (loginPacket.getProtocolVersion() > GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) {
-                // Too early to determine session locale
-                session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.server", supportedVersions));
-                return true;
-            } else if (loginPacket.getProtocolVersion() < GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) {
-                session.disconnect(GeyserLocale.getLocaleStringLog("geyser.network.outdated.client", supportedVersions));
+        if (!newProtocol) {
+            if (!setCorrectCodec(loginPacket.getProtocolVersion())) { // REMOVE WHEN ONLY 1.19.30 IS SUPPORTED OR 1.20
                 return true;
             }
         }
 
-        session.getUpstream().getSession().setPacketCodec(packetCodec);
-
         // Set the block translation based off of version
         session.setBlockMappings(BlockRegistries.BLOCKS.forVersion(loginPacket.getProtocolVersion()));
         session.setItemMappings(Registries.ITEMS.forVersion(loginPacket.getProtocolVersion()));
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3aa66d493..f6d13ad0d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,6 +38,9 @@ dependencyResolutionManagement {
         maven("https://jitpack.io") {
             content { includeGroupByRegex("com\\.github\\..*") }
         }
+
+        // For Adventure snapshots
+        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     }
 }