Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-02-04 14:01:33 +01:00
Code Issues Projects Releases Wiki Activity

Actually rebuild patches

Browse Source
This commit is contained in:
Shane Freeder 2024-11-18 19:44:11 +00:00
parent 55fa6fa06d
commit 9171ef7042
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
32 changed files with 1038 additions and 1058 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
View File

@ -1,4 +1,4 @@
From f2f55cb7743a44bc8d0db757315cbfab4d43f22f Mon Sep 17 00:00:00 2001
From e8b830735afa54b82ac3ebbc9a64601a4dbfb360 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:34:52 -0700
Subject: [PATCH] Fetch modules from the Waterfall API endpoint
@ -6,24 +6,11 @@ Subject: [PATCH] Fetch modules from the Waterfall API endpoint
Don't fetch from the BungeeCord CI, as that only has their modules
diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
index 2536435c..5bb86152 100644
index 064639f3..6a6661a5 100644
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
@@ -1,10 +1,10 @@
package net.md_5.bungee.module;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
import lombok.Data;
import net.md_5.bungee.Util;
@@ -18,13 +18,21 @@ public class JenkinsModuleSource implements ModuleSource
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
@@ -19,11 +19,19 @@ public class JenkinsModuleSource implements ModuleSource
ProxyServer.getInstance().getLogger().info( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
try
{
- URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
@ -41,11 +28,8 @@ index 2536435c..5bb86152 100644
con.setReadTimeout( 15000 );
+ con.setRequestProperty( "User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36" );
- Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
+ Files.copy( con.getInputStream(), module.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING );
System.out.println( "Download complete" );
} catch ( IOException ex )
{
Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
ProxyServer.getInstance().getLogger().info( "Download complete" );
--
2.43.0
2.47.0

8
BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 33836af35fea51d5c0c09c5b355f557b6caa8e95 Mon Sep 17 00:00:00 2001
From 1f600472dc962c517bdd8dd1f7f5572808263a88 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
index 82ef4c5d..ef45ea31 100644
index 86412d48..66609085 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -121,6 +121,16 @@ public class ProtocolConstants
@@ -123,6 +123,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index 82ef4c5d..ef45ea31 100644
{
--
2.39.3 (Apple Git-146)
2.47.0

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

@ -1,4 +1,4 @@
From 399142c001df2d50e1cba9eee822388bc39b12ab Mon Sep 17 00:00:00 2001
From b212fd1b0a9b781f13e21b4c1e9c0432640baaf1 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
@ -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 abdbfd1d..04bd6778 100644
index b58a01c6..c7637608 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -277,7 +277,7 @@ public class ServerConnector extends PacketHandler
@@ -286,7 +286,7 @@ public class ServerConnector extends PacketHandler
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -56,10 +56,10 @@ index abdbfd1d..04bd6778 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 4684bfd8..63be43eb 100644
index d518d05f..21019091 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
@@ -313,7 +313,7 @@ public class DownstreamBridge extends PacketHandler
@@ -325,7 +325,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -69,7 +69,7 @@ index 4684bfd8..63be43eb 100644
// changes in the packet are ignored so we need to send it manually
con.unsafe().sendPacket( pluginMessage );
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 25f045be..544d34ed 100644
index 2446f489..380b6012 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -55,7 +55,7 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
@ -82,5 +82,5 @@ index 25f045be..544d34ed 100644
{
@Override
--
2.44.0
2.47.0

8
BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From 064c9dfefd11db8d743f61ab3a4003dca63f3f7b Mon Sep 17 00:00:00 2001
From 4ef93b430b7240ea845535477c4d3ac49f906088 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -250,10 +250,10 @@ index e582808f..29cd91dd 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 1d9a9ee5..616adcf1 100644
index 224f231b..b7d7e71a 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
@@ -806,7 +806,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -823,7 +823,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -263,5 +263,5 @@ index 1d9a9ee5..616adcf1 100644
@Override
--
2.44.0
2.47.0

8
BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch
View File

@ -1,4 +1,4 @@
From 8b98ff8d43ae4244bb9700d76f6d8b02270bc6fd Mon Sep 17 00:00:00 2001
From 2cc77d1ddf7c29c825de970bd7cefcdfab496674 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Sun, 24 Jan 2016 15:13:29 -0700
Subject: [PATCH] Enable TCP_NODELAY.
@ -6,10 +6,10 @@ Subject: [PATCH] Enable TCP_NODELAY.
This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 544d34ed..6a0d3351 100644
index 380b6012..f1fce77b 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -195,6 +195,7 @@ public class PipelineUtils
@@ -194,6 +194,7 @@ public class PipelineUtils
{
// IP_TOS is not supported (Windows XP / Windows Server 2003)
}
@ -18,5 +18,5 @@ index 544d34ed..6a0d3351 100644
ch.config().setWriteBufferWaterMark( MARK );
--
2.44.0
2.47.0

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

@ -1,4 +1,4 @@
From 87cb9413787e84d11886b19ed594167c8138e688 Mon Sep 17 00:00:00 2001
From 1aa3fbcfe8aaf58084220dfc5142cff546a0b6c2 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 b7856d92..61ce9ed6 100644
index 21019091..b501f7bd 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
@@ -295,7 +295,6 @@ public class DownstreamBridge extends PacketHandler
@@ -307,7 +307,6 @@ public class DownstreamBridge extends PacketHandler
@SuppressWarnings("checkstyle:avoidnestedblocks")
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -19,7 +19,7 @@ index b7856d92..61ce9ed6 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -322,6 +321,7 @@ public class DownstreamBridge extends PacketHandler
@@ -334,6 +333,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{
@ -28,5 +28,5 @@ index b7856d92..61ce9ed6 100644
String subChannel = in.readUTF();
--
2.43.0
2.47.0

16
BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From 729077c39ea8d44f92ec3941204a153369368729 Mon Sep 17 00:00:00 2001
From 093baa399deb298b579af81ebc95cc560bd188d4 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 d79d5e5c..250e7620 100644
{
packet.read( in, protocol, 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 317fb2d4..db50f379 100644
index 8aa57ed4..7a26c419 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
@@ -884,14 +884,23 @@ public enum Protocol
@@ -917,14 +917,23 @@ public enum Protocol
return protocol;
}
@ -66,10 +66,10 @@ index 317fb2d4..db50f379 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 7a211f1b..a25a493e 100644
index 824166e5..b02121af 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -234,6 +234,12 @@ public class ServerConnector extends PacketHandler
@@ -243,6 +243,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 );
@ -83,10 +83,10 @@ index 7a211f1b..a25a493e 100644
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index 70b58fab..0045a449 100644
index 755b8fd6..699bbe3a 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -343,6 +343,12 @@ public abstract class EntityMap
@@ -345,6 +345,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -100,5 +100,5 @@ index 70b58fab..0045a449 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.45.1
2.47.0

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

@ -1,4 +1,4 @@
From 5343292903efcc962a2a510267018bb5872c3995 Mon Sep 17 00:00:00 2001
From bd268bfef42ab87a581edb79d2fd4f47d665378b 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 f80515d4..050cc29b 100644
index c9e3697e..7ac9e6de 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
@@ -51,6 +51,8 @@ public class UpstreamBridge extends PacketHandler
@ -85,7 +85,7 @@ index f80515d4..050cc29b 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -230,6 +232,20 @@ public class UpstreamBridge extends PacketHandler
@@ -231,6 +233,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -107,5 +107,5 @@ index f80515d4..050cc29b 100644
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.44.0
2.47.0

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

@ -1,4 +1,4 @@
From d5eaa35359d90f611f6450fb6ee12014e0a13921 Mon Sep 17 00:00:00 2001
From 6a3372622d017776aec8f1ddca2987fbf4435cd8 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
@ -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 a25a493e..63920e7e 100644
index b02121af..6f49765f 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler
@@ -533,6 +533,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -19,10 +19,10 @@ index a25a493e..63920e7e 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 d408840d..cd3ed518 100644
index b501f7bd..1c075a9f 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
@@ -790,6 +790,6 @@ public class DownstreamBridge extends PacketHandler
@@ -802,6 +802,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -31,10 +31,10 @@ index d408840d..cd3ed518 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 616adcf1..0fbe8b0d 100644
index b7d7e71a..72f6111e 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
@@ -812,20 +812,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -829,20 +829,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -57,10 +57,10 @@ index 616adcf1..0fbe8b0d 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 bfd5cb5f..2dafa4d9 100644
index 7ac9e6de..0a020ffc 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
@@ -396,6 +396,6 @@ public class UpstreamBridge extends PacketHandler
@@ -397,6 +397,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index bfd5cb5f..2dafa4d9 100644
}
}
--
2.44.0
2.47.0

8
BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch
View File

@ -1,4 +1,4 @@
From 34c7d23c344f60184778406b573dfaa6209be1a9 Mon Sep 17 00:00:00 2001
From 6b92feb2426c2bd0866b6ee3aa7fc175ecea40ca Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
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 0fbe8b0d..deb9fef3 100644
index 72f6111e..fd577788 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
@@ -325,10 +325,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -333,10 +333,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}
@ -29,5 +29,5 @@ index 0fbe8b0d..deb9fef3 100644
disconnect( "" );
}
--
2.44.0
2.47.0

8
BungeeCord-Patches/0021-Better-Decompression-Sanity.patch
View File

@ -1,4 +1,4 @@
From 248079a510a933343b7f52004e87a7c38170a5ed Mon Sep 17 00:00:00 2001
From 2bdd9d8ae204e2645bbb2cb9fb07e45800f9c710 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity
@ -45,10 +45,10 @@ index 445ee947..eaedf4bc 100644
out.add( decompressed );
decompressed = null;
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
index e8d5ed19..00e03bae 100644
index 682bb807..e0a35f73 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -181,7 +181,7 @@ public class ChannelWrapper
@@ -185,7 +185,7 @@ public class ChannelWrapper
if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold >= 0 )
{
@ -58,5 +58,5 @@ index e8d5ed19..00e03bae 100644
if ( compressionThreshold < 0 )
{
--
2.43.0
2.47.0

58
BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From c948a81d4f6604ea281baa2f9a96ac9366ea9e44 Mon Sep 17 00:00:00 2001
From 1c384f08c5a31d8a3b5b38bf87ac23c6066cffc5 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
@ -68,10 +68,10 @@ index 3f9efaa8..5d2597ad 100644
/**
* @return the kick reason
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 e670a57a..307a417b 100644
index 6f49765f..661c6563 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -439,7 +439,7 @@ public class ServerConnector extends PacketHandler
@@ -450,7 +450,7 @@ public class ServerConnector extends PacketHandler
ServerKickEvent event = new ServerKickEvent( user, target, new BaseComponent[]
{
kick.getMessage()
@ -81,56 +81,10 @@ index e670a57a..307a417b 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 cd3ed518..d4036c5d 100644
index 1c075a9f..c567d549 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
@@ -98,16 +98,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
+ // Waterfall start
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
- if ( def != null )
+ ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), TextComponent.fromLegacyText( bungee.getTranslation( "server_went_down" ) ), def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.EXCEPTION ) );
+ if ( event.isCancelled() && event.getCancelServer() != null )
{
server.setObsolete( true );
- con.connectNow( def, ServerConnectEvent.Reason.SERVER_DOWN_REDIRECT );
- con.sendMessage( bungee.getTranslation( "server_went_down" ) );
- } else
+ con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.SERVER_DOWN_REDIRECT );
+ }
+ else
{
- con.disconnect( Util.exception( t ) );
+ con.disconnect0( event.getReason() );
}
+ // Waterfall end
}
@Override
@@ -122,7 +125,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
- con.disconnect( bungee.getTranslation( "lost_connection" ) );
+ // Waterfall start
+ ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
+ ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), TextComponent.fromLegacyText( bungee.getTranslation( "lost_connection" ) ), def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.LOST_CONNECTION ) );
+ if ( event.isCancelled() && event.getCancelServer() != null )
+ {
+ server.setObsolete( true );
+ con.connectNow( event.getCancelServer() );
+ }
+ else
+ {
+ con.disconnect0( event.getReason() );
+ }
+ // Waterfall end
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -633,10 +648,14 @@ public class DownstreamBridge extends PacketHandler
@@ -645,10 +645,14 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -147,5 +101,5 @@ index cd3ed518..d4036c5d 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.44.0
2.47.0

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

@ -1,4 +1,4 @@
From c489acf737b0340bc283c49f39517a14736a58a1 Mon Sep 17 00:00:00 2001
From 96e88d4ac24e1ba6941f1d4f070ec88db6c67ad9 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,7 +75,7 @@ index 0fe647b8..32af4937 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 c8d5648c..7e36c0eb 100644
index 52bca3e9..36582d85 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -285,9 +285,20 @@ public final class UserConnection implements ProxiedPlayer
@ -99,7 +99,7 @@ index c8d5648c..7e36c0eb 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -381,7 +392,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -382,7 +393,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@ -109,5 +109,5 @@ index c8d5648c..7e36c0eb 100644
{
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
--
2.44.0
2.47.0

10
BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From f5c341bf2e3a268299c88c9fe9726111194e498d Mon Sep 17 00:00:00 2001
From 92107dac4cc9aca1290d127e86fbf240a959d493 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
@ -117,7 +117,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 d8f7bc95..d15f2bcc 100644
index 36582d85..df160672 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 @@
@ -142,10 +142,10 @@ index d8f7bc95..d15f2bcc 100644
@Setter
private String lastCommandTabbed;
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 d4036c5d..ad9fc042 100644
index c567d549..a9258264 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
@@ -753,6 +753,32 @@ public class DownstreamBridge extends PacketHandler
@@ -750,6 +750,32 @@ public class DownstreamBridge extends PacketHandler
}
}
@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.45.1
2.47.0

17
BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 044b8172b414f1fb8a4f696402d12adc5720518f Mon Sep 17 00:00:00 2001
From c9c86d9054a05493a074fab732839c90121a1b6d Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -509,19 +509,6 @@ index 3e5ca394..00000000
- return ( lastSpace == -1 ) ? cursor - buffer.length() : cursor - ( buffer.length() - lastSpace - 1 );
- }
-}
diff --git a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
index 9ec4920e..d3abee44 100644
--- a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
+++ b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
@@ -44,7 +44,7 @@ public class ModuleManager
ModuleVersion bungeeVersion = ModuleVersion.parse( proxy.getVersion() );
if ( bungeeVersion == null )
{
- System.out.println( "Couldn't detect bungee version. Custom build?" );
+ proxy.getLogger().warning( "Couldn't detect bungee version. Custom build?" ); // Waterfall - Use logger
return;
}
diff --git a/slf4j/nb-configuration.xml b/slf4j/nb-configuration.xml
deleted file mode 100644
index 7e465924..00000000
@ -1588,5 +1575,5 @@ index 21a48df6..00000000
-
-}
--
2.39.3 (Apple Git-146)
2.47.0

8
BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From 34ee64660bf849e84b516b691fde2772ff3f758e Mon Sep 17 00:00:00 2001
From 396b6aec9b76caa9d06636bbd8b15f23ba03449a Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
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 05261ccf..fcd973e5 100644
index 1a6b7ae3..d6872035 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
@@ -388,7 +388,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -396,7 +396,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
case 3:
transferred = handshake.getRequestedProtocol() == 3;
// Login
@ -77,5 +77,5 @@ index 05261ccf..fcd973e5 100644
ch.setProtocol( Protocol.LOGIN );
--
2.44.0
2.47.0

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

@ -1,4 +1,4 @@
From 19006aa082232d2d527b49872c4e8c14988a8565 Mon Sep 17 00:00:00 2001
From e940da46ebd2e126da2b76a536e8ef77b206eb54 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
@ -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 e10f33ad..c0c523e3 100644
index 661c6563..cc5afa04 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -264,7 +264,8 @@ public class ServerConnector extends PacketHandler
@@ -273,7 +273,8 @@ 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 ) );
}
@ -70,7 +70,7 @@ index e10f33ad..c0c523e3 100644
{
ch.write( user.getSettings() );
}
@@ -319,6 +320,7 @@ public class ServerConnector extends PacketHandler
@@ -328,6 +329,7 @@ public class ServerConnector extends PacketHandler
user.getTabListHandler().onServerChange();
Scoreboard serverScoreboard = user.getServerSentScoreboard();
@ -78,7 +78,7 @@ index e10f33ad..c0c523e3 100644
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new ScoreboardObjective(
@@ -342,6 +344,7 @@ public class ServerConnector extends PacketHandler
@@ -351,6 +353,7 @@ public class ServerConnector extends PacketHandler
{
user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) );
}
@ -86,7 +86,7 @@ index e10f33ad..c0c523e3 100644
serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() )
@@ -360,13 +363,34 @@ public class ServerConnector extends PacketHandler
@@ -369,13 +372,34 @@ public class ServerConnector extends PacketHandler
}
user.setDimensionChange( true );
@ -94,7 +94,7 @@ index e10f33ad..c0c523e3 100644
+ if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer
{
user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(),
(byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
(byte) 0, login.getDeathLocation(), login.getPortalCooldown(), login.getSeaLevel() ) );
}
user.setServerEntityId( login.getEntityId() );
@ -106,24 +106,24 @@ index e10f33ad..c0c523e3 100644
+ // Only send if we are not in the same dimension
+ if ( login.getDimension() != user.getDimension() ) // Waterfall - defer
+ {
+ user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), (byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
+ user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), (byte) 0, login.getDeathLocation(), login.getPortalCooldown(), login.getSeaLevel() ) );
+ }
+ Login modLogin = new Login( login.getEntityId(), login.isHardcore(), login.getGameMode(), login.getPreviousGameMode(), login.getWorldNames(), login.getDimensions(), login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(),
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isLimitedCrafting(), login.isDebug(), login.isFlat(), login.getDeathLocation(),
+ login.getPortalCooldown(), login.isSecureProfile() );
+ login.getPortalCooldown(), login.getSeaLevel(), login.isSecureProfile() );
+ user.unsafe().sendPacket(modLogin);
+ // Only send if we're in the same dimension
+ if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
+ {
+ user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), (byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
+ user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), (byte) 0, login.getDeathLocation(), login.getPortalCooldown(), login.getSeaLevel() ) );
+ }
+ }
+ // Waterfall end
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(),
(byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
(byte) 0, login.getDeathLocation(), login.getPortalCooldown(), login.getSeaLevel() ) );
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 d15f2bcc..b8762fc0 100644
index df160672..a84f9b12 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -821,4 +821,9 @@ public final class UserConnection implements ProxiedPlayer
@ -137,10 +137,10 @@ index d15f2bcc..b8762fc0 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 ad9fc042..6ed25f82 100644
index a9258264..da3db022 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
@@ -757,6 +757,7 @@ public class DownstreamBridge extends PacketHandler
@@ -754,6 +754,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
{
@ -148,7 +148,7 @@ index ad9fc042..6ed25f82 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()) {
@@ -768,6 +769,7 @@ public class DownstreamBridge extends PacketHandler
@@ -765,6 +766,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
{
@ -157,7 +157,7 @@ index ad9fc042..6ed25f82 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index 0045a449..39eab669 100644
index 699bbe3a..0f9f5957 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -27,6 +27,11 @@ public abstract class EntityMap
@ -172,7 +172,7 @@ index 0045a449..39eab669 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -305,7 +310,13 @@ public abstract class EntityMap
@@ -307,7 +312,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -225,5 +225,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.45.1
2.47.0

8
BungeeCord-Patches/0044-Add-ProxyDefineCommandsEvent.patch
View File

@ -1,4 +1,4 @@
From 8c33d4de8183d34c90460a315ad42307e731c4dc Mon Sep 17 00:00:00 2001
From b93ab3b66e55042fa4965d287eb4bec71d2532dc 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,10 +54,10 @@ 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 6ed25f82..1a863dc0 100644
index da3db022..7b9c9268 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
@@ -792,9 +792,25 @@ public class DownstreamBridge extends PacketHandler
@@ -789,9 +789,25 @@ public class DownstreamBridge extends PacketHandler
{
boolean modified = false;
@ -86,5 +86,5 @@ index 6ed25f82..1a863dc0 100644
CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
.then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
--
2.44.0
2.47.0

1679
BungeeCord-Patches/0046-OSX-native-zlib-and-crypto.patch
View File

File diff suppressed because it is too large Load Diff

10
BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From 9abe9adf843bb142e7ff2d5888f49d89ed08367a Mon Sep 17 00:00:00 2001
From 4ee0d7b23287f5d557f54cb1072fc3ab9f931182 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
@ -172,10 +172,10 @@ index 237955ab..d0bd4d75 100644
+ // Waterfall end
}
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 fcd973e5..473edd76 100644
index d6872035..a7241527 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
@@ -21,6 +21,8 @@ import javax.crypto.SecretKey;
@@ -23,6 +23,8 @@ import javax.crypto.SecretKey;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -184,7 +184,7 @@ index fcd973e5..473edd76 100644
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
@@ -510,6 +512,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -518,6 +520,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.44.0
2.47.0

8
BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch
View File

@ -1,4 +1,4 @@
From 2ee860a1e91e6e08c061c0338dc60458afe618ca Mon Sep 17 00:00:00 2001
From 10d6d10e393b7642c67a334d1da7279c8f8e9275 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 1a863dc0..d5405b90 100644
index 7b9c9268..96655cb7 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
@@ -174,8 +174,14 @@ public class DownstreamBridge extends PacketHandler
@@ -171,8 +171,14 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PlayerListItem playerList) throws Exception
{
@ -71,5 +71,5 @@ index 1a863dc0..d5405b90 100644
@Override
--
2.44.0
2.47.0

8
BungeeCord-Patches/0051-Remove-version-from-brand-info.patch
View File

@ -1,14 +1,14 @@
From c702bcf84aeca3cc1e1791ef19e081b8e2df64d0 Mon Sep 17 00:00:00 2001
From 874f2333b281a17a07efe555d3799f50ce46acbb 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 d5405b90..3bca89be 100644
index 96655cb7..213c130f 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
@@ -332,7 +332,7 @@ public class DownstreamBridge extends PacketHandler
@@ -329,7 +329,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 d5405b90..3bca89be 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.44.0
2.47.0

10
BungeeCord-Patches/0052-Add-auth-url-option.patch
View File

@ -1,14 +1,14 @@
From 0e7f030c8314b7ca0176021eb3cb8dc85ac60832 Mon Sep 17 00:00:00 2001
From af32bdf15c26fbc215936d4011604fd435b8e23b 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
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 473edd76..d095e5f9 100644
index a7241527..e3a1f744 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
@@ -83,6 +83,8 @@ import net.md_5.bungee.util.QuietException;
@@ -87,6 +87,8 @@ import net.md_5.bungee.util.QuietException;
public class InitialHandler extends PacketHandler implements PendingConnection
{
@ -17,7 +17,7 @@ index 473edd76..d095e5f9 100644
private final BungeeCord bungee;
private ChannelWrapper ch;
@Getter
@@ -538,7 +540,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -548,7 +550,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" ) : "";
@ -27,5 +27,5 @@ index 473edd76..d095e5f9 100644
Callback<String> handler = new Callback<String>()
{
--
2.44.0
2.47.0

8
BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
View File

@ -1,4 +1,4 @@
From 6603022d84bbaf4302d6e65fe79282924cbe8679 Mon Sep 17 00:00:00 2001
From cff6ef34d7eb83a4762d29e230b530e70616e1e1 Mon Sep 17 00:00:00 2001
From: FivePB <admin@fivepb.me>
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 d095e5f9..864cb119 100644
index e3a1f744..bbaf947f 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
@@ -848,9 +848,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -865,9 +865,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
for ( String id : content.split( "\0" ) )
{
@ -101,5 +101,5 @@ index d095e5f9..864cb119 100644
}
} else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
--
2.44.0
2.47.0

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

@ -1,4 +1,4 @@
From 63ef97642f82dd1c190d47cc6b58a42fada64c2d Mon Sep 17 00:00:00 2001
From 8ad2dc138d2ee4a68720ce6b179dfb75f8d96c22 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,7 +31,7 @@ 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 ee527938..2813c16f 100644
index a84f9b12..951fa17d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -298,12 +298,16 @@ public final class UserConnection implements ProxiedPlayer
@ -53,7 +53,7 @@ index ee527938..2813c16f 100644
builder.connectTimeout(timeout); // Waterfall
if ( callback != null )
{
@@ -351,7 +355,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -352,7 +356,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
}
@ -62,7 +62,7 @@ index ee527938..2813c16f 100644
return;
}
if ( pendingConnects.contains( target ) )
@@ -361,7 +365,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -362,7 +366,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
}
@ -71,7 +71,7 @@ index ee527938..2813c16f 100644
return;
}
@@ -397,14 +401,14 @@ public final class UserConnection implements ProxiedPlayer
@@ -398,14 +402,14 @@ public final class UserConnection implements ProxiedPlayer
ServerInfo def = updateAndGetNextServer( target );
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
@ -90,5 +90,5 @@ index ee527938..2813c16f 100644
}
}
--
2.44.0
2.47.0

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

@ -1,4 +1,4 @@
From 7cec69fe57fe38d7ce33e58023d690f9ade8219a Mon Sep 17 00:00:00 2001
From 889fe24a64472d2f23786c4dcad5ed59aa5d6736 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 2813c16f..f29a6f62 100644
index 951fa17d..e98bf147 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -429,7 +429,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -430,7 +430,8 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{
@ -27,5 +27,5 @@ index 2813c16f..f29a6f62 100644
@Override
--
2.44.0
2.47.0

10
BungeeCord-Patches/0059-Improve-login-state-transition.patch
View File

@ -1,14 +1,14 @@
From 91ba8610d491e730d73485443773c8a24024a4d0 Mon Sep 17 00:00:00 2001
From 9bc80c19893dd16e36b2e1fb67ceed4971a1a010 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
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 864cb119..6344462c 100644
index bbaf947f..37715ba9 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
@@ -512,6 +512,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -520,6 +520,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 864cb119..6344462c 100644
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
// Waterfall start
@@ -566,7 +567,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -576,7 +577,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
}
};
@ -26,5 +26,5 @@ index 864cb119..6344462c 100644
}
--
2.44.0
2.47.0

8
BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch
View File

@ -1,4 +1,4 @@
From c4dec751225b67840a2d1092920fd487d2b4d165 Mon Sep 17 00:00:00 2001
From 1f9e69b8ef64b3ecd7ac64ac61bef3486f6b9545 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 db50f379..b0473509 100644
index 7a26c419..f84bfab8 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 db50f379..b0473509 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -965,9 +967,12 @@ public enum Protocol
@@ -998,9 +1000,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
@ -34,5 +34,5 @@ index db50f379..b0473509 100644
}
}
--
2.45.1
2.47.0

8
BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch
View File

@ -1,4 +1,4 @@
From 1c5029315edd50653076483bba5e7e406fe07848 Mon Sep 17 00:00:00 2001
From 793b803787b1644c63d7505f2eb89b729a2e3606 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 6344462c..d58caade 100644
index 37715ba9..31a7e109 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
@@ -435,6 +435,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -443,6 +443,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
{
@ -32,5 +32,5 @@ index 149c742f..8d5075f6 100644
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.44.0
2.47.0

16
BungeeCord-Patches/0063-Replace-reflection-inside-netty-with-ChannelFactory.patch
View File

@ -1,4 +1,4 @@
From 429d77cd283c12f043fb0da276a0a3856aa31ab2 Mon Sep 17 00:00:00 2001
From 51c676a4225026c9553e4f4f1596dbd9574773c6 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 f29a6f62..1d009633 100644
index e98bf147..d6561c60 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -414,7 +414,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -415,7 +415,7 @@ public final class UserConnection implements ProxiedPlayer
}
};
Bootstrap b = new Bootstrap()
@ -69,7 +69,7 @@ index 37337429..c3683c30 100644
}
// Waterfall End
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 3b157d79..52c308f7 100644
index 75d2bd0e..37e37aaf 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -5,6 +5,7 @@ import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
@ -80,7 +80,7 @@ index 3b157d79..52c308f7 100644
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
@@ -125,6 +126,12 @@ public class PipelineUtils
@@ -124,6 +125,12 @@ public class PipelineUtils
private static boolean epoll;
private static boolean io_uring;
@ -93,7 +93,7 @@ index 3b157d79..52c308f7 100644
static
{
@@ -155,6 +162,12 @@ public class PipelineUtils
@@ -154,6 +161,12 @@ public class PipelineUtils
}
}
}
@ -106,7 +106,7 @@ index 3b157d79..52c308f7 100644
}
public static EventLoopGroup newEventLoopGroup(int threads, ThreadFactory factory)
@@ -186,6 +199,34 @@ public class PipelineUtils
@@ -185,6 +198,34 @@ public class PipelineUtils
return io_uring ? IOUringSocketChannel.class : epoll ? EpollSocketChannel.class : NioSocketChannel.class;
}
@ -142,5 +142,5 @@ index 3b157d79..52c308f7 100644
{
return io_uring ? IOUringDatagramChannel.class : epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
--
2.44.0
2.47.0

8
BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
View File

@ -1,14 +1,14 @@
From 52469c9e7dbe741742c9504d69ccfc7e3e90a4f5 Mon Sep 17 00:00:00 2001
From 1c5154b28e2e752d104ad4bf9a02043d0b8c22ee Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
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 d58caade..f28576f6 100644
index 31a7e109..185e63ad 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
@@ -188,7 +188,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -194,7 +194,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -28,5 +28,5 @@ index d58caade..f28576f6 100644
@Override
--
2.44.0
2.47.0

20
BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
View File

@ -1,4 +1,4 @@
From 0952d57b25738151a17baef23d393ed7f4356861 Mon Sep 17 00:00:00 2001
From b160d8c6f7d3026d15fb27b472e2b49cf3393eca Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 15 Oct 2023 00:36:38 +0100
Subject: [PATCH] Prevent proxy commands from breaking the chat chain system
@ -19,12 +19,12 @@ index e2221010..4dde7257 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 b0473509..f25d3fab 100644
index f84bfab8..fb239f75 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
@@ -558,6 +558,13 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 ),
map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 )
@@ -586,6 +586,13 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 ),
map( ProtocolConstants.MINECRAFT_1_21_2, 0x07 )
);
+ // Waterfall start
+ TO_SERVER.registerPacket(
@ -76,7 +76,7 @@ index 00000000..08ecf2a3
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
index 887ff29f..d4700090 100644
index 33c838f9..f259ee91 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
@@ -108,4 +108,9 @@ public class ClientCommand extends DefinedPacket
@ -90,10 +90,10 @@ index 887ff29f..d4700090 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 2dafa4d9..b482fe2e 100644
index 0a020ffc..d509ce7e 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
@@ -196,16 +196,22 @@ public class UpstreamBridge extends PacketHandler
@@ -197,16 +197,22 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(ClientCommand command) throws Exception
{
@ -118,7 +118,7 @@ index 2dafa4d9..b482fe2e 100644
{
for ( int index = 0, length = message.length(); index < length; index++ )
{
@@ -224,7 +230,13 @@ public class UpstreamBridge extends PacketHandler
@@ -225,7 +231,13 @@ public class UpstreamBridge extends PacketHandler
if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) )
{
return message;
@ -133,5 +133,5 @@ index 2dafa4d9..b482fe2e 100644
throw CancelSendSignal.INSTANCE;
}
--
2.45.1
2.47.0