Updated Upstream (BungeeCord) (Closes #771)

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:
69631561 #3366: Improve consistency and appearance of default translations
dd3f8200 #3363, #3369: Implement new ServerData packet to stop MOTD data from servers
This commit is contained in:
Shane Freeder 2022-08-14 18:48:43 +01:00
parent 38725c7fde
commit 6ca6b706df
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
13 changed files with 61 additions and 61 deletions

@ -1 +1 @@
Subproject commit 78ca16dfe3bf9a21d5c054a1884d4f5f198a62bc
Subproject commit 696315615d67cc5387b502d1d5ac0ceaae4fadbf

View File

@ -1,4 +1,4 @@
From 7221b508d3c28eabee2cbcf6f6f02aa0a7dca43c Mon Sep 17 00:00:00 2001
From c0d98ec188ecc7b38d6b29d67621234eb00a0c24 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -50,7 +50,7 @@ index 70b292f0..91f71c09 100644
* Allow this packet to be sent as an "extended" packet.
*/
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 7c082d46..5c74d5f1 100644
index 3be014b2..e00c5659 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -249,7 +249,7 @@ public class ServerConnector extends PacketHandler
@ -63,10 +63,10 @@ index 7c082d46..5c74d5f1 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 257779bf..c0cd8570 100644
index 6f5ef07b..e41bfcfd 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
@@ -276,7 +276,7 @@ public class DownstreamBridge extends PacketHandler
@@ -277,7 +277,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -89,5 +89,5 @@ index 56563346..61165e43 100644
{
@Override
--
2.32.0 (Apple Git-132)
2.37.1

View File

@ -1,4 +1,4 @@
From d2e4ef8cea2353c302776ba3bf29f4a2fcf32569 Mon Sep 17 00:00:00 2001
From 57a159ccea803646202595a832cee7da8d2d489b Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -23,10 +23,10 @@ index dddc14d8..7227f268 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 c0cd8570..a047c8b7 100644
index e41bfcfd..9c724115 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
@@ -258,7 +258,6 @@ public class DownstreamBridge extends PacketHandler
@@ -259,7 +259,6 @@ public class DownstreamBridge extends PacketHandler
@SuppressWarnings("checkstyle:avoidnestedblocks")
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -34,7 +34,7 @@ index c0cd8570..a047c8b7 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -285,6 +284,7 @@ public class DownstreamBridge extends PacketHandler
@@ -286,6 +285,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{
@ -43,5 +43,5 @@ index c0cd8570..a047c8b7 100644
String subChannel = in.readUTF();
--
2.35.1
2.37.1

View File

@ -1,4 +1,4 @@
From f7b0de343be482debb742d1a647ad83f82e32f03 Mon Sep 17 00:00:00 2001
From b3057a714b38ebe1b996866c97b3f45df47a5081 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -37,10 +37,10 @@ index 773e954c..57bd22b7 100644
{
packet.read( in, prot.getDirection(), protocolVersion );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 04dc178d..03b6d132 100644
index aa22f134..7a1fdac5 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -582,14 +582,23 @@ public enum Protocol
@@ -589,14 +589,23 @@ public enum Protocol
return protocol;
}

View File

@ -1,4 +1,4 @@
From 63b50851ec7d18ca93f6d1e535e49fd465633ed6 Mon Sep 17 00:00:00 2001
From a2d3b8db72aabd1de2bf7c573381daf0eb36f763 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 aa721cdc..981b0200 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 a047c8b7..f8691bc4 100644
index 9c724115..a0301a95 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
@@ -681,6 +681,6 @@ public class DownstreamBridge extends PacketHandler
@@ -691,6 +691,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{

View File

@ -1,4 +1,4 @@
From 4b776b6e9f93f2e3eb2d778afbacd11748a2c9b6 Mon Sep 17 00:00:00 2001
From 0027c75f59e7413a26d0f95060b084961893a514 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
@ -62,7 +62,7 @@ index 0e1ef5c4..ee63732d 100644
@Deprecated
public String getKickReason()
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 175150c7..5595278b 100644
index 981b0200..9bd063f5 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -377,7 +377,7 @@ public class ServerConnector extends PacketHandler
@ -75,10 +75,10 @@ index 175150c7..5595278b 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 f8691bc4..98bebb94 100644
index a0301a95..de932814 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
@@ -87,16 +87,19 @@ public class DownstreamBridge extends PacketHandler
@@ -88,16 +88,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -103,7 +103,7 @@ index f8691bc4..98bebb94 100644
}
@Override
@@ -111,7 +114,19 @@ public class DownstreamBridge extends PacketHandler
@@ -112,7 +115,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -124,7 +124,7 @@ index f8691bc4..98bebb94 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -565,7 +580,11 @@ public class DownstreamBridge extends PacketHandler
@@ -566,7 +581,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -138,5 +138,5 @@ index f8691bc4..98bebb94 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.35.1
2.37.1

View File

@ -1,11 +1,11 @@
From 0db9e0d2e1a466e10fab4ba883ecb3991b36fdc4 Mon Sep 17 00:00:00 2001
From 6ce9629fc1456ddcb536bb6406b2a7d4d2aace73 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
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index 2658e144..bbfa05e9 100644
index 608769eb..1defe650 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -10,6 +10,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
@ -17,8 +17,8 @@ index 2658e144..bbfa05e9 100644
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
import net.md_5.bungee.protocol.packet.Handshake;
@@ -208,4 +210,14 @@ public abstract class AbstractPacketHandler
public void handle(GameState gameState) throws Exception
@@ -213,4 +215,14 @@ public abstract class AbstractPacketHandler
public void handle(ServerData serverData) throws Exception
{
}
+
@ -33,7 +33,7 @@ index 2658e144..bbfa05e9 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 03b6d132..71adb32c 100644
index 7a1fdac5..9701705d 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -20,6 +20,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@ -45,7 +45,7 @@ index 03b6d132..71adb32c 100644
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
@@ -130,6 +132,20 @@ public enum Protocol
@@ -131,6 +133,20 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_17, 0x0D ),
map( ProtocolConstants.MINECRAFT_1_19, 0x0A )
);
@ -185,7 +185,7 @@ index 846f8338..7fe08ecd 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 98bebb94..b5f8c473 100644
index de932814..e3171326 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
@@ -51,6 +51,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@ -197,7 +197,7 @@ index 98bebb94..b5f8c473 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;
@@ -665,6 +667,32 @@ public class DownstreamBridge extends PacketHandler
@@ -666,6 +668,32 @@ public class DownstreamBridge extends PacketHandler
}
}

View File

@ -1,4 +1,4 @@
From 55af4745e71a2fff9fd35ebabc656b562a81788a Mon Sep 17 00:00:00 2001
From e129a2d1042dfe9b973df216ea418b41331b80dd 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
@ -140,10 +140,10 @@ index 7fe08ecd..5961392a 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 b5f8c473..01b29247 100644
index e3171326..3b56018a 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
@@ -671,6 +671,7 @@ public class DownstreamBridge extends PacketHandler
@@ -672,6 +672,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityEffect entityEffect) throws Exception
{
@ -151,7 +151,7 @@ index b5f8c473..01b29247 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()) {
@@ -682,6 +683,7 @@ public class DownstreamBridge extends PacketHandler
@@ -683,6 +684,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityRemoveEffect removeEffect) throws Exception
{

View File

@ -1,4 +1,4 @@
From 50b4c8768067c05fd7eb4214b637b44cb294929d Mon Sep 17 00:00:00 2001
From 69adecb315d4a27121887e2c9dc29850d989e77d 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 01b29247..e2adf3f2 100644
index 3b56018a..a4f242b2 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
@@ -19,8 +19,10 @@ import io.netty.channel.unix.DomainSocketAddress;
@ -68,7 +68,7 @@ index 01b29247..e2adf3f2 100644
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.ServerConnection.KeepAliveData;
@@ -706,9 +708,25 @@ public class DownstreamBridge extends PacketHandler
@@ -707,9 +709,25 @@ public class DownstreamBridge extends PacketHandler
{
boolean modified = false;
@ -97,5 +97,5 @@ index 01b29247..e2adf3f2 100644
CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
.then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
--
2.35.1
2.37.1

View File

@ -1,4 +1,4 @@
From 3e42daf051cb9b48d7b0ec77f9f627b76abf1059 Mon Sep 17 00:00:00 2001
From dd6a077069d7c3b46b2df58f4cb5c955f485e48f Mon Sep 17 00:00:00 2001
From: xDark <aleshkailyashevich@gmail.com>
Date: Fri, 31 May 2019 08:11:31 +0300
Subject: [PATCH] Allow to disable tablist rewrite
@ -50,10 +50,10 @@ index e860214f..b88e3c8a 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 e2adf3f2..74575854 100644
index a4f242b2..9dfb11e9 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
@@ -167,8 +167,14 @@ public class DownstreamBridge extends PacketHandler
@@ -168,8 +168,14 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PlayerListItem playerList) throws Exception
{
@ -71,5 +71,5 @@ index e2adf3f2..74575854 100644
@Override
--
2.36.1
2.37.1

View File

@ -1,14 +1,14 @@
From db63f4a157fa622cc50c402c3e701b4b4149bbb3 Mon Sep 17 00:00:00 2001
From 1df5f9893bcbb0b8b15015247aa8b19ea899b488 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 20 Jun 2020 18:21:17 +0100
Subject: [PATCH] Remove version from brand info
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 74575854..97c4b210 100644
index 9dfb11e9..59d204ce 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
@@ -299,7 +299,7 @@ public class DownstreamBridge extends PacketHandler
@@ -300,7 +300,7 @@ public class DownstreamBridge extends PacketHandler
Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
brand = ByteBufAllocator.DEFAULT.heapBuffer();
@ -18,5 +18,5 @@ index 74575854..97c4b210 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.35.1
2.37.1

View File

@ -1,4 +1,4 @@
From 33eda5e5b22255416fdb33bdef016639d8126b7c Mon Sep 17 00:00:00 2001
From 06e5ba42d7e797c36e15c761142d185d3a7a7425 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 12 Jun 2022 06:45:54 +0100
Subject: [PATCH] Add protocol version to packet not found message
@ -6,7 +6,7 @@ Subject: [PATCH] Add protocol version to packet not found message
Also avoids a double get, but, this is probably trivial
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 71adb32c..fb126a21 100644
index 9701705d..b852a24e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -2,6 +2,8 @@ package net.md_5.bungee.protocol;
@ -18,7 +18,7 @@ index 71adb32c..fb126a21 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -668,9 +670,12 @@ public enum Protocol
@@ -675,9 +677,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}

View File

@ -1,4 +1,4 @@
From 171ad9fc9951742a355c9b7374ad4805c81e8a16 Mon Sep 17 00:00:00 2001
From e1d9793c800fb426a1f6b4245c2e20da93ec01b3 Mon Sep 17 00:00:00 2001
From: Aurora <aurora@relanet.eu>
Date: Mon, 18 Jul 2022 15:56:05 +0200
Subject: [PATCH] Add message for outdated clients that don't support secure
@ -8,10 +8,10 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is
things checked those outdated clients didn't get a useful message telling them to update.
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 24893418..d230c796 100644
index 6011078f..975b6996 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
@@ -394,6 +394,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -395,6 +395,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() )
{
@ -20,17 +20,17 @@ index 24893418..d230c796 100644
if ( publicKey == null )
{
diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties
index 58380d4a..50c16a95 100644
index e42b798b..76ad621f 100644
--- a/proxy/src/main/resources/messages.properties
+++ b/proxy/src/main/resources/messages.properties
@@ -25,6 +25,7 @@ offline_mode_player=Not authenticated with Minecraft.net
secure_profile_required=A secure profile is required to join this server.
secure_profile_expired=Secure profile expired.
secure_profile_invalid=Secure profile invalid.
+secure_profile_unsupported=Outdated client, secure profile not supported. Please use 1.19 or newer.
@@ -25,6 +25,7 @@ offline_mode_player=\u00a7cNot authenticated with Minecraft.net
secure_profile_required=\u00a7cA secure profile is required to join this server.
secure_profile_expired=\u00a7cSecure profile expired.
secure_profile_invalid=\u00a7cSecure profile invalid.
+secure_profile_unsupported=\u00a7cOutdated client, secure profile not supported. Please use 1.19 or newer.
message_needed=\u00a7cYou must supply a message.
error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
--
2.37.1.windows.1
2.37.1