From ce48007a7d07ddc7d4d2dd842b70aa74e7034163 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 29 Sep 2023 14:47:25 +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: 1ef4d27d #3543: Bump io.netty:netty-bom from 4.1.97.Final to 4.1.99.Final 94a1fb51 #3535: Queue packets of Title api 78aef86a #3533: Don't put initial client in configure phase until server is ready --- BungeeCord | 2 +- ...Don-t-access-a-ByteBuf-s-underlying-array.patch | 6 +++--- .../0010-Optimize-uuid-conversions.patch | 6 +++--- ...upport-for-FML-with-IP-Forwarding-enabled.patch | 8 ++++---- ...llow-invalid-packet-ids-for-forge-servers.patch | 10 +++++----- .../0018-Improve-server-list-ping-logging.patch | 14 +++++++------- ...a-property-to-accept-invalid-ping-packets.patch | 6 +++--- .../0025-Improve-ServerKickEvent.patch | 6 +++--- ...ccess-to-the-player-s-LoginResult-on-Logi.patch | 8 ++++---- ...Optionally-log-InitialHandler-connections.patch | 6 +++--- ...option-to-disable-entity-metadata-rewriti.patch | 14 +++++++------- .../0048-Speed-up-some-common-exceptions.patch | 8 ++++---- BungeeCord-Patches/0053-Add-auth-url-option.patch | 8 ++++---- ...0057-Configurable-plugin-messaging-limits.patch | 6 +++--- .../0060-Improve-login-state-transition.patch | 8 ++++---- ...-for-outdated-clients-that-don-t-support-.patch | 6 +++--- ...spam-from-clients-registeirng-too-many-ch.patch | 6 +++--- 17 files changed, 64 insertions(+), 64 deletions(-) diff --git a/BungeeCord b/BungeeCord index b34cfcd..1ef4d27 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit b34cfcde5a9256fd18e6979559d5c28b0d34b59d +Subproject commit 1ef4d27dbea48a1d47501ad2be0d75e42cc2cc12 diff --git a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch index 65df2ec..938366e 100644 --- a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch +++ b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch @@ -1,4 +1,4 @@ -From 26fe18efeeb9121455d23354b9f1869096a6ac6e Mon Sep 17 00:00:00 2001 +From 8c8b25883c768d798456d7289d057275d790b677 Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 3 May 2016 20:31:52 -0700 Subject: [PATCH] Don't access a ByteBuf's underlying array @@ -43,10 +43,10 @@ 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 7ef4ee91..287a0545 100644 +index 409464d2..76db3a71 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -266,7 +266,7 @@ public class ServerConnector extends PacketHandler +@@ -265,7 +265,7 @@ public class ServerConnector extends PacketHandler ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch index daa3c35..acdd6d4 100644 --- a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch +++ b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch @@ -1,4 +1,4 @@ -From c9671bec552214bb7a11f23b331be48f9486287d Mon Sep 17 00:00:00 2001 +From f2c91fe1c64c1b9d468063c57165a808be7235e1 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 14 Mar 2016 15:40:44 -0700 Subject: [PATCH] Optimize uuid conversions @@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 100644 } 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 e542c1be..107ff484 100644 +index 09080f36..14a34f99 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 -@@ -735,7 +735,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -722,7 +722,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String getUUID() { diff --git a/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch b/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch index c20cc77..1bfef34 100644 --- a/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch +++ b/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch @@ -1,4 +1,4 @@ -From 9862433d237c305eea0735ced32b5bac5a18a9b0 Mon Sep 17 00:00:00 2001 +From 0a7710b54fbc938b1913070090ebeb7b6e3bdd5f Mon Sep 17 00:00:00 2001 From: Daniel Naylor Date: Tue, 25 Oct 2016 12:23:07 -0400 Subject: [PATCH] Add support for FML with IP Forwarding enabled @@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw No breaking changes occur due to this patch. 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 287a0545..7c3e9a29 100644 +index 76db3a71..3aacebe1 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator; @@ -23,7 +23,7 @@ index 287a0545..7c3e9a29 100644 import java.util.Queue; import java.util.Set; import java.util.UUID; -@@ -110,15 +111,39 @@ public class ServerConnector extends PacketHandler +@@ -109,15 +110,39 @@ public class ServerConnector extends PacketHandler String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID(); LoginResult profile = user.getPendingConnection().getLoginProfile(); @@ -67,7 +67,7 @@ index 287a0545..7c3e9a29 100644 } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index c1c73aba..00c88e4d 100644 +index be65c3ad..6ca259cb 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -170,8 +170,12 @@ public final class UserConnection implements ProxiedPlayer diff --git a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch index 1f3d37e..341cca1 100644 --- a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch +++ b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch @@ -1,4 +1,4 @@ -From f2b7723b3a39d08901799d3205d6aa93e70f89b3 Mon Sep 17 00:00:00 2001 +From ff46baa5671121531007c00dc684dc035a16dd8c Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 19 May 2016 17:09:22 -0600 Subject: [PATCH] Allow invalid packet ids for forge servers @@ -9,7 +9,7 @@ Vanilla servers still error on negative/invalid packets. Original issue: https://github.com/WaterfallMC/Waterfall-Old/issues/11 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java -index 1bc50e8c..0244ec1a 100644 +index 482341ef..76a3ddd0 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java @@ -18,6 +18,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder @@ -37,7 +37,7 @@ index 1bc50e8c..0244ec1a 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 285e591e..5eb00df3 100644 +index b6985fee..7f001b11 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 @@ -749,14 +749,23 @@ public enum Protocol @@ -66,7 +66,7 @@ index 285e591e..5eb00df3 100644 throw new BadPacketException( "Packet with id " + id + " outside of range" ); } 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 7c3e9a29..56e500a1 100644 +index 3aacebe1..a5c8de90 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -34,7 +34,9 @@ import net.md_5.bungee.forge.ForgeUtils; @@ -79,7 +79,7 @@ index 7c3e9a29..56e500a1 100644 import net.md_5.bungee.protocol.PacketWrapper; import net.md_5.bungee.protocol.Protocol; import net.md_5.bungee.protocol.ProtocolConstants; -@@ -223,6 +225,12 @@ public class ServerConnector extends PacketHandler +@@ -222,6 +224,12 @@ public class ServerConnector extends PacketHandler public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnection user, BungeeServerInfo target, ForgeServerHandler handshakeHandler, ServerConnection server, Login login) throws Exception { ServerConnectedEvent event = new ServerConnectedEvent( user, server ); diff --git a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch index a366142..d9fc071 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 0176a0d6c9210a5799e6f745ad6c400eb814f40a Mon Sep 17 00:00:00 2001 +From 09ffc62269020ad3f6155d99bed12aefdcdad7f6 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 @@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this patch remains for a few misc improvements around here 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 56e500a1..0ef085ef 100644 +index a5c8de90..59403052 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -500,6 +500,6 @@ public class ServerConnector extends PacketHandler +@@ -499,6 +499,6 @@ public class ServerConnector extends PacketHandler @Override public String toString() { @@ -31,10 +31,10 @@ index 23e7b6d8..88b0156c 100644 } } 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 c1e5a156..1f9a54f2 100644 +index 14a34f99..7e2d0c63 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 -@@ -741,20 +741,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -728,20 +728,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String toString() { @@ -57,10 +57,10 @@ index c1e5a156..1f9a54f2 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 d8c1c040..045e9545 100644 +index 771ebb3e..1e27872c 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 -@@ -374,6 +374,6 @@ public class UpstreamBridge extends PacketHandler +@@ -385,6 +385,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() { diff --git a/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch index 59d7a7b..c469a9d 100644 --- a/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch +++ b/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch @@ -1,4 +1,4 @@ -From eda9cacd20244f3823b9a1fa99d760ab4a584bad Mon Sep 17 00:00:00 2001 +From 1b52a13e4834482bb8b9daa3e54556fc2e612668 Mon Sep 17 00:00:00 2001 From: Techcable Date: Sun, 7 Feb 2016 00:01:19 -0700 Subject: [PATCH] Add a property to accept invalid ping packets @@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm Fixes #23 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 68687242..72dad6d3 100644 +index 7e2d0c63..9fd951be 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 -@@ -302,10 +302,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -301,10 +301,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection thisState = State.PING; } diff --git a/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch index 256d871..dd1f00f 100644 --- a/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch +++ b/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch @@ -1,4 +1,4 @@ -From 4b8555541651cd8725da0ee0ece99f70b41ff82a Mon Sep 17 00:00:00 2001 +From e5c22d17359ad3da880b5ae4d656b707ad0f73d3 Mon Sep 17 00:00:00 2001 From: Nathan Poirier Date: Tue, 28 Jun 2016 23:00:49 -0500 Subject: [PATCH] Improve ServerKickEvent @@ -62,10 +62,10 @@ 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 0ef085ef..2624dd37 100644 +index 59403052..f981313e 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -417,7 +417,7 @@ public class ServerConnector extends PacketHandler +@@ -416,7 +416,7 @@ public class ServerConnector extends PacketHandler public void handle(Kick kick) throws Exception { ServerInfo def = user.updateAndGetNextServer( target ); diff --git a/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch index ff20576..2f09802 100644 --- a/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch +++ b/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch @@ -1,4 +1,4 @@ -From c758a573aca65b1bb5e71a016b0c06a5673b2700 Mon Sep 17 00:00:00 2001 +From 43c06de639e73d67cd03f36d12a406236ba8fec4 Mon Sep 17 00:00:00 2001 From: phenomax Date: Thu, 10 Aug 2017 18:41:17 +0200 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent @@ -52,10 +52,10 @@ similarity index 100% rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java 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 72dad6d3..dfe63771 100644 +index 9fd951be..488eff1d 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 -@@ -618,7 +618,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -614,7 +614,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection }; // fire login event @@ -63,7 +63,7 @@ index 72dad6d3..dfe63771 100644 + bungee.getPluginManager().callEvent( new LoginEvent( InitialHandler.this, complete, this.getLoginProfile() ) ); // Waterfall: Parse LoginResult object to new constructor of LoginEvent } - @Override + private void finish2() -- 2.42.0 diff --git a/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch index 827ef54..e0bd9d7 100644 --- a/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch +++ b/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch @@ -1,4 +1,4 @@ -From f4fead4cd59131552737c497b7f7a0b583b2bdb0 Mon Sep 17 00:00:00 2001 +From d139603bfda2a1fa02f3b5d53f2588d95052fe50 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 8 Feb 2018 19:10:52 +0100 Subject: [PATCH] Optionally log InitialHandler connections @@ -61,10 +61,10 @@ index ef44d334..4ff8da6d 100644 public String getGameVersion() { return gameVersion; 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 dfe63771..2c70d1f9 100644 +index 488eff1d..0dfc1413 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 -@@ -357,7 +357,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -356,7 +356,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection break; case 2: // Login diff --git a/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch index 5bd4762..3f8318c 100644 --- a/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch +++ b/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch @@ -1,4 +1,4 @@ -From 81af9ba73891328559c20a7ed62ac0ff72a4a8e6 Mon Sep 17 00:00:00 2001 +From 4daf7cef8acb15511f300aa4507d6f4fb5c7c6d6 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 14 Jan 2019 03:35:21 +0000 Subject: [PATCH] Provide an option to disable entity metadata rewriting @@ -57,10 +57,10 @@ index 4ff8da6d..e860214f 100644 + } } 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 2624dd37..55218447 100644 +index f981313e..57136c2d 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -255,7 +255,7 @@ public class ServerConnector extends PacketHandler +@@ -254,7 +254,7 @@ public class ServerConnector extends PacketHandler ch.write( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:register" : "REGISTER", Joiner.on( "\0" ).join( registeredChannels ).getBytes( StandardCharsets.UTF_8 ), false ) ); } @@ -69,7 +69,7 @@ index 2624dd37..55218447 100644 { ch.write( user.getSettings() ); } -@@ -310,6 +310,7 @@ public class ServerConnector extends PacketHandler +@@ -309,6 +309,7 @@ public class ServerConnector extends PacketHandler user.getTabListHandler().onServerChange(); Scoreboard serverScoreboard = user.getServerSentScoreboard(); @@ -77,7 +77,7 @@ index 2624dd37..55218447 100644 for ( Objective objective : serverScoreboard.getObjectives() ) { user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) ); -@@ -322,6 +323,7 @@ public class ServerConnector extends PacketHandler +@@ -321,6 +322,7 @@ public class ServerConnector extends PacketHandler { user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) ); } @@ -85,7 +85,7 @@ index 2624dd37..55218447 100644 serverScoreboard.clear(); for ( UUID bossbar : user.getSentBossBars() ) -@@ -340,13 +342,34 @@ public class ServerConnector extends PacketHandler +@@ -339,13 +341,34 @@ public class ServerConnector extends PacketHandler } user.setDimensionChange( true ); @@ -122,7 +122,7 @@ index 2624dd37..55218447 100644 (byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) ); if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 ) diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index 4d9db4de..a25f9e79 100644 +index 85adab0f..9e2046a4 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -801,4 +801,10 @@ public final class UserConnection implements ProxiedPlayer diff --git a/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch index 94cb24a..38deecc 100644 --- a/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch +++ b/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch @@ -1,4 +1,4 @@ -From c1ce17266ec28c0dcc4ed252223c856eb327d2e3 Mon Sep 17 00:00:00 2001 +From 94e538b0a962da3d0d293ecafad4f7e99d257d1e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 25 Nov 2019 19:54:06 +0000 Subject: [PATCH] Speed up some common exceptions @@ -133,7 +133,7 @@ index 00000000..2583aa2c + } +} diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java -index fa021598..aaf1269e 100644 +index 5f4ec289..3d806129 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java @@ -80,7 +80,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder @@ -146,7 +146,7 @@ index fa021598..aaf1269e 100644 { if ( slice != null ) 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 2c70d1f9..186c3890 100644 +index 0dfc1413..d7c29eb8 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 @@ -16,6 +16,8 @@ import java.util.Set; @@ -158,7 +158,7 @@ index 2c70d1f9..186c3890 100644 import lombok.Getter; import lombok.RequiredArgsConstructor; import net.md_5.bungee.BungeeCord; -@@ -473,6 +475,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -472,6 +474,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" ); SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); diff --git a/BungeeCord-Patches/0053-Add-auth-url-option.patch b/BungeeCord-Patches/0053-Add-auth-url-option.patch index be86b83..ae57ce4 100644 --- a/BungeeCord-Patches/0053-Add-auth-url-option.patch +++ b/BungeeCord-Patches/0053-Add-auth-url-option.patch @@ -1,14 +1,14 @@ -From b8873d3a2b533a0fb20e2280f49ea882e5490def Mon Sep 17 00:00:00 2001 +From 30d3802d87f843f01a3b02e53d4ca306abe11d42 Mon Sep 17 00:00:00 2001 From: theminecoder Date: Sun, 19 Jul 2020 10:18:23 +1000 Subject: [PATCH] Add auth url option 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 186c3890..699fecb8 100644 +index d7c29eb8..f0346fc6 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 -@@ -77,6 +77,8 @@ import net.md_5.bungee.util.QuietException; +@@ -76,6 +76,8 @@ import net.md_5.bungee.util.QuietException; public class InitialHandler extends PacketHandler implements PendingConnection { @@ -17,7 +17,7 @@ index 186c3890..699fecb8 100644 private final BungeeCord bungee; private ChannelWrapper ch; @Getter -@@ -501,7 +503,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -500,7 +502,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" ); String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : ""; diff --git a/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch b/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch index b3444dd..a26a244 100644 --- a/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch +++ b/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch @@ -1,4 +1,4 @@ -From 8bae6fb2c4cdab54ff43b787c6eeef1ee7855f3d Mon Sep 17 00:00:00 2001 +From a824f915466921ca6b97c768ca373342a1f184a0 Mon Sep 17 00:00:00 2001 From: FivePB Date: Tue, 16 Nov 2021 21:15:32 +0100 Subject: [PATCH] Configurable plugin messaging limits @@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 100644 + } } 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 699fecb8..9a3c4809 100644 +index f0346fc6..f067cfcf 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 -@@ -777,9 +777,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -764,9 +764,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection for ( String id : content.split( "\0" ) ) { diff --git a/BungeeCord-Patches/0060-Improve-login-state-transition.patch b/BungeeCord-Patches/0060-Improve-login-state-transition.patch index 73e2b34..4f3ee71 100644 --- a/BungeeCord-Patches/0060-Improve-login-state-transition.patch +++ b/BungeeCord-Patches/0060-Improve-login-state-transition.patch @@ -1,14 +1,14 @@ -From 2444418060a1837f6bffabb0021f73c73403eb9f Mon Sep 17 00:00:00 2001 +From 1a92c1c479b57073a5ba98af31966b93af7b2f50 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 8 May 2022 12:04:30 +0100 Subject: [PATCH] Improve login state transition 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 9a3c4809..c26f41fb 100644 +index f067cfcf..baa5a58e 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 -@@ -475,6 +475,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -474,6 +474,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection { Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" ); Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" ); @@ -16,7 +16,7 @@ index 9a3c4809..c26f41fb 100644 SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); // Waterfall start -@@ -529,7 +530,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -528,7 +529,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection } } }; diff --git a/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch b/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch index 5c44c70..1b15ba7 100644 --- a/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch +++ b/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch @@ -1,4 +1,4 @@ -From 7a8edbac1d13abdb7f72ba159cc15808926871dd Mon Sep 17 00:00:00 2001 +From 9c8d002cc916c5821eef456bace829fc76d2e1d1 Mon Sep 17 00:00:00 2001 From: Aurora 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 c26f41fb..9b388263 100644 +index baa5a58e..c3f5db1a 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 -@@ -398,6 +398,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -397,6 +397,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 ) { diff --git a/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch b/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch index d9091d0..c9f307d 100644 --- a/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch +++ b/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch @@ -1,14 +1,14 @@ -From 4e3af74b4bea1184e7a63dc8f4f6631eecba658b Mon Sep 17 00:00:00 2001 +From 92b7609dd85a8eb3d8f300a34f8355eb5f1e1c3c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 21 Apr 2023 15:32:33 +0100 Subject: [PATCH] reduce log spam from clients registeirng too many channels 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 9b388263..395e36b4 100644 +index c3f5db1a..98b78de2 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 -@@ -165,7 +165,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -164,7 +164,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public void handle(PluginMessage pluginMessage) throws Exception {