From adf2ad05776b9818db346523423e47a7790fe696 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2023 12:16:40 +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: a7dbbc2f #3544: Remove redundant super call in handle(FinishConfiguration) 68b2df2b #3514: Add separator property to SelectorComponent --- BungeeCord | 2 +- .../0018-Improve-server-list-ping-logging.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BungeeCord b/BungeeCord index 1ef4d27..a7dbbc2 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 1ef4d27dbea48a1d47501ad2be0d75e42cc2cc12 +Subproject commit a7dbbc2f0a4bc741d695016fc9597d185b965e5d diff --git a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch index d9fc071..791cc36 100644 --- a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From 09ffc62269020ad3f6155d99bed12aefdcdad7f6 Mon Sep 17 00:00:00 2001 +From e8ea9698ec9af3d3ccc6be444b8a604aae29041a Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Sat, 12 Dec 2015 23:43:30 +0100 Subject: [PATCH] Improve server list ping logging @@ -57,10 +57,10 @@ index 14a34f99..7e2d0c63 100644 @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 771ebb3e..1e27872c 100644 +index 4a561406..14fac032 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 -@@ -385,6 +385,6 @@ public class UpstreamBridge extends PacketHandler +@@ -383,6 +383,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() {