From 0aa2871b261681dc53c71ae3ed8f177ce97fe6e1 Mon Sep 17 00:00:00 2001
From: Outfluencer <git@outfluencer.dev>
Date: Wed, 22 Jan 2025 21:11:11 +0100
Subject: [PATCH] #3761: Whitelist LoginPayloadResponse in
 UpstreamBridge#shouldHandle

Required for #3758 to function correctly.
---
 .../main/java/net/md_5/bungee/connection/InitialHandler.java   | 3 +++
 .../main/java/net/md_5/bungee/connection/UpstreamBridge.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 2d365c39..472714b3 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -704,6 +704,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
         }
         Preconditions.checkState( future != null, "Unexpected custom LoginPayloadResponse" );
         future.complete( response.getData() );
+
+        // we should never pass this to the backend
+        throw CancelSendSignal.INSTANCE;
     }
 
     @Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 49967de9..e508ad91 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -132,7 +132,7 @@ public class UpstreamBridge extends PacketHandler
     @Override
     public boolean shouldHandle(PacketWrapper packet) throws Exception
     {
-        return con.getServer() != null || packet.packet instanceof PluginMessage || packet.packet instanceof CookieResponse;
+        return con.getServer() != null || packet.packet instanceof PluginMessage || packet.packet instanceof CookieResponse || packet.packet instanceof LoginPayloadResponse;
     }
 
     @Override