Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

This commit is contained in:
linsaftw 2023-07-05 16:39:28 -03:00
parent b435ffee69
commit e09387ccab
16 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit c7adcf9fdf9c4aaf748d7ba2bf5b303bf6156cf1
Subproject commit 9f5ace9025cc28d4d1f43e0a1cd4fddd6505c4dc

6
BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From bdc30eaf00e869918b59265da8b7137306ebc051 Mon Sep 17 00:00:00 2001
From 5a885d3a6d9cca71c973199b8a888ff73a004318 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
@ -56,10 +56,10 @@ index a99d9914..1683ca6d 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 e133d933..e2fe18a1 100644
index 528d53ac..6d877842 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
@@ -294,7 +294,7 @@ public class DownstreamBridge extends PacketHandler
@@ -296,7 +296,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );

10
BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From 51fe7e01d834ef8c6f41f6cd3ebb2adec745ffe4 Mon Sep 17 00:00:00 2001
From ec1315b517091468cb0b93f66f8357b47e98441e Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
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 28205be3..b71a2c35 100644
index 1683ca6d..06f48792 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;
@ -67,10 +67,10 @@ index 28205be3..b71a2c35 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 e1b084ea..f0fb7694 100644
index 67a4269a..d7e27674 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -167,8 +167,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token.
*/
--
2.35.3
2.40.1.windows.1

8
BungeeCord-Patches/0015-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From e173c3c8d13d6ea60d8dabd6b2f30b1ee7e67c07 Mon Sep 17 00:00:00 2001
From bb7f70182d10d4aae6bb5e43693c2a88a29abda5 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
@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
- Don't create a data input stream for every plugin message we get from servers
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 e2fe18a1..99fa3b24 100644
index 6d877842..b8368fc6 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,6 @@ public class DownstreamBridge extends PacketHandler
@@ -278,7 +278,6 @@ public class DownstreamBridge extends PacketHandler
@SuppressWarnings("checkstyle:avoidnestedblocks")
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -19,7 +19,7 @@ index e2fe18a1..99fa3b24 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -303,6 +302,7 @@ public class DownstreamBridge extends PacketHandler
@@ -305,6 +304,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{

6
BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
View File

@ -1,4 +1,4 @@
From 93cf44bd32d98d76176be7e214346ee4b0621fe3 Mon Sep 17 00:00:00 2001
From ad1e6829f48f854ef392f5a95061758bfa07d8d8 Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling
@ -73,7 +73,7 @@ index 741ebfde..91743f01 100644
+ }
}
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 37a17c21..e87cd53a 100644
index a3536903..20f7e262 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
@@ -44,6 +44,8 @@ public class UpstreamBridge extends PacketHandler
@ -105,7 +105,7 @@ index 37a17c21..e87cd53a 100644
+ // Waterfall end - tab limiter
List<String> suggestions = new ArrayList<>();
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.40.1.windows.1

10
BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 003d8774168ddbc73f7b3192f791d1aefbf36358 Mon Sep 17 00:00:00 2001
From 8708b51c5b44e49ca2fa6e31cd98cfd40011f865 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 536fd38e..ab9a5eeb 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 99fa3b24..9e1a6d35 100644
index b8368fc6..bf288935 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
@@ -740,6 +740,6 @@ public class DownstreamBridge extends PacketHandler
@@ -759,6 +759,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -57,10 +57,10 @@ index bd8a467d..b8450c28 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 e87cd53a..c30093d7 100644
index 20f7e262..fa0a1ea3 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
@@ -328,6 +328,6 @@ public class UpstreamBridge extends PacketHandler
@@ -338,6 +338,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{

10
BungeeCord-Patches/0025-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From c84676969bbc1d716f1f5c26d1f6146fa1f10ebf Mon Sep 17 00:00:00 2001
From 3f45690babcd64128f50db74b9a3881a2c77fd33 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,10 +75,10 @@ index ab9a5eeb..d45d46e8 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 9e1a6d35..fd100f15 100644
index bf288935..7a1d7051 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
@@ -91,16 +91,19 @@ public class DownstreamBridge extends PacketHandler
@@ -93,16 +93,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -103,7 +103,7 @@ index 9e1a6d35..fd100f15 100644
}
@Override
@@ -115,7 +118,19 @@ public class DownstreamBridge extends PacketHandler
@@ -117,7 +120,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -124,7 +124,7 @@ index 9e1a6d35..fd100f15 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -614,7 +629,11 @@ public class DownstreamBridge extends PacketHandler
@@ -616,7 +631,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );

8
BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From 8d5a6970594e5b5bfadae8170663109ec07b017f Mon Sep 17 00:00:00 2001
From cdb41bec26755d924314da7f44c4a2529822948e Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
@ -75,10 +75,10 @@ index c3848b3c..a441a424 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
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 4b530a8b..32d222f7 100644
index 28963f3f..2982a26d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -255,9 +255,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -258,9 +258,20 @@ public final class UserConnection implements ProxiedPlayer
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{
@ -99,7 +99,7 @@ index 4b530a8b..32d222f7 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -351,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -354,7 +365,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );

17
BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From 1a52982fef14b2372aa9e0bc1e3a0bd02e0d63e2 Mon Sep 17 00:00:00 2001
From 2d8e1838383d08785a2ecf3d1ed3d7d3e87ac310 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
@ -160,7 +160,7 @@ index 00000000..7ed2dc3a
+ }
+}
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 32d222f7..e0a9d338 100644
index 2982a26d..acda5834 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -1,7 +1,9 @@
@ -173,10 +173,11 @@ index 32d222f7..e0a9d338 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@@ -128,6 +130,11 @@ public final class UserConnection implements ProxiedPlayer
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();
@Setter
private String lastCommandTabbed;
+
+ // Waterfall start
+ @Getter
+ private final Multimap<Integer, Integer> potions = HashMultimap.create();
@ -185,10 +186,10 @@ index 32d222f7..e0a9d338 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 fd100f15..faf5b97a 100644
index 7a1d7051..f0f37cf2 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;
@@ -54,6 +54,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.BossBar;
import net.md_5.bungee.protocol.packet.Commands;
@ -197,7 +198,7 @@ index fd100f15..faf5b97a 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;
@@ -714,6 +716,32 @@ public class DownstreamBridge extends PacketHandler
@@ -733,6 +735,32 @@ public class DownstreamBridge extends PacketHandler
}
}

12
BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From b995f498698c773fa399ccfb76ac53fce6e3438e Mon Sep 17 00:00:00 2001
From c18bb801217bb0af9809d339cdb6d192101f214f 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
@ -121,10 +121,10 @@ index d45d46e8..5bec25d1 100644
false, 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 e0a9d338..35bf4c9f 100644
index acda5834..fe55370c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -775,4 +775,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -779,4 +779,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}
@ -136,10 +136,10 @@ index e0a9d338..35bf4c9f 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 faf5b97a..07e82e3c 100644
index f0f37cf2..67d57d24 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
@@ -720,6 +720,7 @@ public class DownstreamBridge extends PacketHandler
@@ -739,6 +739,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityEffect entityEffect) throws Exception
{
@ -147,7 +147,7 @@ index faf5b97a..07e82e3c 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()) {
@@ -731,6 +732,7 @@ public class DownstreamBridge extends PacketHandler
@@ -750,6 +751,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityRemoveEffect removeEffect) throws Exception
{

10
BungeeCord-Patches/0045-Add-ProxyDefineCommandsEvent.patch
View File

@ -1,4 +1,4 @@
From b8ab200096dff40f7d50f5e37a545a5d79ef62bd Mon Sep 17 00:00:00 2001
From 497b5320d7a7af6f91b0cb7e87fcbbcc01f9b5e5 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,21 +54,23 @@ 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 07e82e3c..c574eef8 100644
index 67d57d24..b88ec9f2 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;
@@ -19,10 +19,12 @@ import io.netty.channel.unix.DomainSocketAddress;
import java.io.DataInput;
import java.net.InetSocketAddress;
import java.util.ArrayList;
+import java.util.HashMap; // Waterfall
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
+import java.util.Objects; // Waterfall
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.ServerConnection.KeepAliveData;
@@ -755,9 +757,25 @@ public class DownstreamBridge extends PacketHandler
@@ -774,9 +776,25 @@ public class DownstreamBridge extends PacketHandler
{
boolean modified = false;

6
BungeeCord-Patches/0051-Allow-to-disable-tablist-rewrite.patch
View File

@ -1,4 +1,4 @@
From 8c9ad6853f1a8ce5d26c2ac9d2b207f5f165acb3 Mon Sep 17 00:00:00 2001
From 7d3f77489f2596b7bc7848683a52015e0c12c27e 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 c574eef8..e342952d 100644
index b88ec9f2..114867f6 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
@@ -171,8 +171,14 @@ public class DownstreamBridge extends PacketHandler
@@ -173,8 +173,14 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PlayerListItem playerList) throws Exception
{

6
BungeeCord-Patches/0052-Remove-version-from-brand-info.patch
View File

@ -1,14 +1,14 @@
From 4daf5a93e524cf2794dad888318448f67dd300ee Mon Sep 17 00:00:00 2001
From 8b7c5c9b7939a61f242963bb26bb71f78fa15b5f 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 e342952d..1093c0ba 100644
index 114867f6..7f9f71f7 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
@@ -317,7 +317,7 @@ public class DownstreamBridge extends PacketHandler
@@ -319,7 +319,7 @@ public class DownstreamBridge extends PacketHandler
Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
brand = ByteBufAllocator.DEFAULT.heapBuffer();

12
BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch
View File

@ -1,4 +1,4 @@
From ef9720457e081a1e60b05ef669aec98ee2cd6f10 Mon Sep 17 00:00:00 2001
From d98f558f1860d45417ca6da53af0241b933d30f3 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 16 Apr 2021 06:29:28 +0100
Subject: [PATCH] ServerConnectRequest#sendFeedback
@ -31,10 +31,10 @@ index c81b0a4e..d21370be 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 35bf4c9f..88e31adb 100644
index fe55370c..0206fe58 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer
@@ -272,12 +272,16 @@ public final class UserConnection implements ProxiedPlayer
connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
}
@ -53,7 +53,7 @@ index 35bf4c9f..88e31adb 100644
builder.connectTimeout(timeout); // Waterfall
if ( callback != null )
{
@@ -321,7 +325,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -325,7 +329,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
}
@ -62,7 +62,7 @@ index 35bf4c9f..88e31adb 100644
return;
}
if ( pendingConnects.contains( target ) )
@@ -331,7 +335,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -335,7 +339,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
}
@ -71,7 +71,7 @@ index 35bf4c9f..88e31adb 100644
return;
}
@@ -367,14 +371,14 @@ public final class UserConnection implements ProxiedPlayer
@@ -371,14 +375,14 @@ public final class UserConnection implements ProxiedPlayer
ServerInfo def = updateAndGetNextServer( target );
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{

6
BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
View File

@ -1,4 +1,4 @@
From cd4c416c7693ee613a7f49b556b47616af66f690 Mon Sep 17 00:00:00 2001
From d422dfa2ad2081944c59a601c3362036f4317566 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 22 Mar 2022 14:56:44 +0000
Subject: [PATCH] Don't send exceptions to the client during kicks, etc
@ -13,10 +13,10 @@ allows for retaining much of the overall context here, i.e. who
was this exception assocated with?
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 88e31adb..bc0af8a5 100644
index 0206fe58..7b5291ba 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -399,7 +399,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -403,7 +403,8 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{

6
BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch
View File

@ -1,4 +1,4 @@
From f834edf6801b27987f75562fb67598fd616f7eae Mon Sep 17 00:00:00 2001
From de12a343367c8b2c2d981e70249cf386bd30b9e2 Mon Sep 17 00:00:00 2001
From: Janmm14 <gitconfig1@janmm14.de>
Date: Mon, 21 Jun 2021 23:43:39 +0200
Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
@ -32,10 +32,10 @@ index 377df7ec..8f531f85 100644
.handler( PipelineUtils.BASE_SERVERSIDE )
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
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 bc0af8a5..cf82c182 100644
index 7b5291ba..0d772c8a 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -384,7 +384,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -388,7 +388,7 @@ public final class UserConnection implements ProxiedPlayer
}
};
Bootstrap b = new Bootstrap()