Updated Upstream (BungeeCord)

Upstream has released updates that appears 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: e93c762f #2921: ClickEvent without value exceptions in window title 023f407b #2928: Add IPOther special plugin message 64e4f465 #2931: Fix exceptions on ChatColor.of(Color) due to truncation
2025-03-02 10:41:11 +01:00 · 2020-08-29 12:11:57 +01:00 · 2020-08-29 12:11:57 +01:00 · 8075dbe95d
commit 8075dbe95d
parent 056d6687ef
7 changed files with 24 additions and 24 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit aa22fe68e5fb3ed26e19022d0419e269c95afcfe
+Subproject commit e93c762f164b45af15b577a1372044958b97cbef
--- a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
@ -1,4 +1,4 @@
-From 21937b942f19419a3ff746c081c97cc4e654ca0f Mon Sep 17 00:00:00 2001
+From 7746bcf3c90d6015eb497d3eb2a27b8102df6d9e Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@ -19,10 +19,10 @@ index eb8ae99a..934ad406 100644
     }
 }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index d1e57953..11bdceef 100644
+index a859195e..b9783a4c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -635,6 +635,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -654,6 +654,6 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public String toString()
     {
@ -69,5 +69,5 @@ index 49fec0d7..a2f36f23 100644
     }
 }
 -- 
-2.24.0
+2.28.0

--- a/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch
@ -1,4 +1,4 @@
-From 0ff39b86f3d2919ad03d26d9de587c2de8ce4692 Mon Sep 17 00:00:00 2001
+From d59223808d72f9b5f6b869a17a91260a6a3acaee Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@ -75,7 +75,7 @@ index 934ad406..2b762d4f 100644
         {
             // Pre cancel the event if we are going to try another server
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 11bdceef..4e5b3541 100644
+index b9783a4c..757a595b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -12,6 +12,7 @@ import com.mojang.brigadier.context.StringRange;
@ -132,7 +132,7 @@ index 11bdceef..4e5b3541 100644
         }
 
         ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -519,7 +535,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -538,7 +554,11 @@ public class DownstreamBridge extends PacketHandler
     public void handle(Kick kick) throws Exception
     {
         ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -146,5 +146,5 @@ index 11bdceef..4e5b3541 100644
         {
             con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.24.0
+2.28.0

--- a/BungeeCord-Patches/0032-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0032-Fix-potion-race-condition-on-Forge-1.8.9.patch
@ -1,4 +1,4 @@
-From ccbd921b22378ca421f9820a40199ac4885b8ee6 Mon Sep 17 00:00:00 2001
+From d1cae1a3697ae9bfa0599b0e4658a2cee7fbb07a Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -197,7 +197,7 @@ index 76ab1481..fae9805c 100644
     @Getter
     private String displayName;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 4e5b3541..4dab32b4 100644
+index 757a595b..033877fc 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -52,6 +52,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@ -209,7 +209,7 @@ index 4e5b3541..4dab32b4 100644
 import net.md_5.bungee.protocol.packet.KeepAlive;
 import net.md_5.bungee.protocol.packet.Kick;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
-@@ -620,6 +622,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -639,6 +641,32 @@ public class DownstreamBridge extends PacketHandler
         }
     }
 
@ -280,5 +280,5 @@ index d15044f4..bea2bbff 100644
      * Sends the server mod list to the client, or stores it for sending later.
      *
 -- 
-2.24.0
+2.28.0

--- a/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch
+++ b/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch
@ -1,4 +1,4 @@
-From a7048eccf962db2eb15adbbac1ce478622bf881a Mon Sep 17 00:00:00 2001
+From 4f9ac58287cdb55b2bcd935dfe4bbc4a2571fdc5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 14 Jan 2019 03:35:21 +0000
 Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -138,10 +138,10 @@ index fae9805c..b0125245 100644
 +    // Waterfall end
 }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 4dab32b4..9ce48a40 100644
+index 033877fc..72b6e9be 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -626,6 +626,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -645,6 +645,7 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(EntityEffect entityEffect) throws Exception
     {
@ -149,7 +149,7 @@ index 4dab32b4..9ce48a40 100644
         // Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
         // condition on the client.
         if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
-@@ -637,6 +638,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -656,6 +657,7 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(EntityRemoveEffect removeEffect) throws Exception
     {
@ -234,5 +234,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.24.0
+2.28.0

--- a/BungeeCord-Patches/0047-Add-ProxyDefineCommandsEvent.patch
+++ b/BungeeCord-Patches/0047-Add-ProxyDefineCommandsEvent.patch
@ -1,4 +1,4 @@
-From 63ae6c45b92d9913a10439b15c9c1af70472adfe Mon Sep 17 00:00:00 2001
+From f36d1c7e29ee37a364a530794c674bdab826e774 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 14 Mar 2019 07:44:06 +0000
 Subject: [PATCH] Add ProxyDefineCommandsEvent
@ -54,7 +54,7 @@ index 00000000..1fd4fc90
 +
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 9ce48a40..4a60ba5b 100644
+index 72b6e9be..ace177ba 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -12,7 +12,8 @@ import com.mojang.brigadier.context.StringRange;
@ -78,7 +78,7 @@ index 9ce48a40..4a60ba5b 100644
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.ServerConnection;
 import net.md_5.bungee.ServerConnection.KeepAliveData;
-@@ -661,9 +664,25 @@ public class DownstreamBridge extends PacketHandler
+@@ -680,9 +683,25 @@ public class DownstreamBridge extends PacketHandler
     {
         boolean modified = false;
 
@ -107,5 +107,5 @@ index 9ce48a40..4a60ba5b 100644
                 LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() )
                         .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.24.0
+2.28.0

--- a/BungeeCord-Patches/0057-Add-auth-url-option.patch
+++ b/BungeeCord-Patches/0057-Add-auth-url-option.patch
@ -1,4 +1,4 @@
-From 6a2b973f2c1499eb5508cd3424a0660e4f44c803 Mon Sep 17 00:00:00 2001
+From 18de08eb94180ea4cd7742e326b366b08a753774 Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Sun, 19 Jul 2020 10:18:23 +1000
 Subject: [PATCH] Add auth url option
@ -27,5 +27,5 @@ index b848e451..4b40b465 100644
         Callback<String> handler = new Callback<String>()
         {
 -- 
-2.24.3 (Apple Git-128)
+2.28.0