From 1231b4d27c0dee6d59127030ce8745d28663cf58 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 29 Apr 2024 14:30:31 +0100 Subject: [PATCH] Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 6e175173 #3608, #3676: Close connection if HAProxy 2.0 message is a health check 6335af84 SPIGOT-7638: Library loader does not seem to resolve every dependency --- BungeeCord | 2 +- .../0061-Expand-packet-decode-logging-usage.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BungeeCord b/BungeeCord index 336333a..6e17517 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 336333acb1e6140556271545c71f784083559dcc +Subproject commit 6e1751733f6b3dafe824dcd7f00d5ed86572ba37 diff --git a/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch b/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch index 2a30f2a..9ccfe2c 100644 --- a/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch +++ b/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch @@ -1,14 +1,14 @@ -From 76c901d6879fc774867b51da71abb31c10bdc8ab Mon Sep 17 00:00:00 2001 +From 46bb2e2fc11e4133b45c1c6af6e1e5d20043f9f1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 19 Jun 2022 10:31:51 +0100 Subject: [PATCH] Expand packet-decode-logging usage diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java -index 206f4227..954ffbc9 100644 +index 6caf30cd..75e802d2 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java -@@ -152,6 +152,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter +@@ -155,6 +155,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - read timed out", handler ); } else if ( cause instanceof DecoderException ) {