Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-03 15:43:37 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
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:
f5157f12 #3438: Fix possible race condition in duplicate player check
df20effa #3557: Replace Guava Charsets with Java StandardCharsets
This commit is contained in:
Shane Freeder 2023-11-04 01:12:26 +00:00
parent b3bf5fd891
commit be3a798a36
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
23 changed files with 106 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit c92581d0dc57840de2a09a8c0cab9fa7773a4d80
Subproject commit f5157f12a4ac26a8f55ca50a276b6d457fc150a2

10
BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
View File

@ -1,4 +1,4 @@
From ece5cfccb9506cc13bb552613cc9424afff3ae51 Mon Sep 17 00:00:00 2001
From 7443ac4a48f0afc87dd65b7b467cfc046d056720 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files
@ -42,10 +42,10 @@ index 00000000..741ebfde
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index e3065f12..f1ddb4d0 100644
index db2a1b99..3429c989 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -10,6 +10,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@ -76,7 +76,7 @@ index 54c3223c..54a6cb38 100644
/**
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index 8ae799c1..0dd69778 100644
index b9e99d6c..f6b5e8b8 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -47,10 +47,15 @@ public class YamlConfig implements ConfigurationAdapter
@ -118,5 +118,5 @@ index 8ae799c1..0dd69778 100644
if ( permissions == null )
{
--
2.38.1
2.42.1

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

@ -1,4 +1,4 @@
From 1668e9e6e23ce2d43df05c7d496cdd086cadd4b9 Mon Sep 17 00:00:00 2001
From 89a9c5c99d3e2e00b2372939540a85567beffa21 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 0bcbc8fb..6562a641 100644
index b1b087aa..b51263a2 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
@@ -718,7 +718,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -721,7 +721,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -263,5 +263,5 @@ index 0bcbc8fb..6562a641 100644
@Override
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From d8cc33712c4b60c77f3a9c793f90c85a9a9f2d74 Mon Sep 17 00:00:00 2001
From c4df62f75d45fdf60a1e171dc3d030a95537a581 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
@ -67,23 +67,24 @@ index 4f1011b9..8a57c5a8 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 18b1690d..db103d32 100644
index 04143a46..12bd18ed 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
@@ -170,9 +170,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );
+ // No-config FML handshake marker.
// Set whether the connection has a 1.8 FML marker in the handshake.
- forgeClientHandler.setFmlTokenInHandshake( this.getPendingConnection().getExtraDataInHandshake().contains( ForgeConstants.FML_HANDSHAKE_TOKEN ) );
-
+ if (this.getPendingConnection().getExtraDataInHandshake().contains( ForgeConstants.FML_HANDSHAKE_TOKEN ))
+ {
+ forgeClientHandler.setFmlTokenInHandshake( true );
+ }
return BungeeCord.getInstance().addConnection( this );
}
public void sendPacket(PacketWrapper packet)
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java
index 6dca2048..f5253b89 100644
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java
@ -100,5 +101,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token.
*/
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From a5ce9cf6ba775ef5163c65cd7f1bafd6cc4ba1d1 Mon Sep 17 00:00:00 2001
From e4cb9d47b2745b761f6c7fd60914ebdb140c695d 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 3c312589..d8c1c040 100644
index 460aa491..84be12e5 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
@@ -49,6 +49,8 @@ public class UpstreamBridge extends PacketHandler
@ -85,7 +85,7 @@ index 3c312589..d8c1c040 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -223,6 +225,20 @@ public class UpstreamBridge extends PacketHandler
@@ -222,6 +224,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -107,5 +107,5 @@ index 3c312589..d8c1c040 100644
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From 74fc5e424568249619d3e514a21a7574978435e1 Mon Sep 17 00:00:00 2001
From 2e0ec517eacbbb7821e7b508d6b844779873e00a 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
@ -31,10 +31,10 @@ index cee4c235..6c545f4c 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 6562a641..9a6a305b 100644
index b51263a2..ea3a9248 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
@@ -724,20 +724,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -727,20 +727,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -57,10 +57,10 @@ index 6562a641..9a6a305b 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 4a561406..14fac032 100644
index 84be12e5..6acbf7bf 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
@@ -383,6 +383,6 @@ public class UpstreamBridge extends PacketHandler
@@ -382,6 +382,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index 4a561406..14fac032 100644
}
}
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From 3cebec2175678a2c7351368beffa2b8e09fb4025 Mon Sep 17 00:00:00 2001
From d4a8080d52e0fbe372bbcdb375757d064e80f685 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 9a6a305b..300d90f4 100644
index ea3a9248..7b02226f 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
@@ -300,10 +300,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -299,10 +299,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}
@ -29,5 +29,5 @@ index 9a6a305b..300d90f4 100644
disconnect( "" );
}
--
2.42.0
2.42.1

10
BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,14 +1,14 @@
From aa9261c4f9c7cac4124d7c144038b033952b3503 Mon Sep 17 00:00:00 2001
From 88834135061418ae8c007a335e2c0e5772f52ce5 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank
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 045e9545..212cdbf2 100644
index 6acbf7bf..05e3bd21 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
@@ -200,6 +200,7 @@ public class UpstreamBridge extends PacketHandler
@@ -199,6 +199,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
@ -16,7 +16,7 @@ index 045e9545..212cdbf2 100644
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -207,8 +208,14 @@ public class UpstreamBridge extends PacketHandler
@@ -206,8 +207,14 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;
@ -32,5 +32,5 @@ index 045e9545..212cdbf2 100644
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From c7e03fafe03c044f0da356ac97c3b08d7b3d16c1 Mon Sep 17 00:00:00 2001
From 73b4887d23fc0825b270acba6cc26b3f68a31e98 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
@ -6,7 +6,7 @@ Subject: [PATCH] Add timeout variant to connect methods
Also added more connect methods to ProxiedPlayer, in addition to the new method
diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
index c3848b3c..a441a424 100644
index ab879248..4db23b3f 100644
--- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
+++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
@@ -126,6 +126,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
@ -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 00c88e4d..242b693e 100644
index 12bd18ed..f7160a66 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -281,9 +281,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -282,9 +282,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 00c88e4d..242b693e 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -377,7 +388,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -378,7 +389,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 00c88e4d..242b693e 100644
{
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
--
2.42.0
2.42.1

8
BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
View File

@ -1,4 +1,4 @@
From d0f2a03e3eae67f9385a46706668c87fc327af94 Mon Sep 17 00:00:00 2001
From e03f7fe257e46bec92ba2a5f102a1b3bdef643f7 Mon Sep 17 00:00:00 2001
From: phenomax <phenomax@revayd.net>
Date: Thu, 10 Aug 2017 18:41:17 +0200
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@ -51,10 +51,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 300d90f4..ecaab6bd 100644
index 7b02226f..bc98b6b1 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
@@ -613,7 +613,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -612,7 +612,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
};
// fire login event
@ -64,5 +64,5 @@ index 300d90f4..ecaab6bd 100644
private void finish2()
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From ec92b7e4e5831157c23f3c2a9e721e8783d165aa Mon Sep 17 00:00:00 2001
From 754e416935ecdc215c4e049819bf1948c3d22eb1 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 ecaab6bd..ae3c6a42 100644
index bc98b6b1..460a79a1 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
@@ -355,7 +355,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -354,7 +354,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
// Login
@ -77,5 +77,5 @@ index ecaab6bd..ae3c6a42 100644
ch.setProtocol( Protocol.LOGIN );
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From 4dee99b416b0e892080cc906e2d075af6bfcf815 Mon Sep 17 00:00:00 2001
From 15b34952e52fec2a6910f67870f79a96aaeb316c 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
@ -123,10 +123,10 @@ index fd1f9266..1f30a5cb 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 cff35a06..4617fc2c 100644
index a5ddcdc3..1d3b7a9d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -790,4 +790,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -791,4 +791,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}
@ -226,5 +226,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.42.0
2.42.1

12
BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From 6c4e6163dc6950c6ee33c07dd5a82d5ba033b08d Mon Sep 17 00:00:00 2001
From 165e3084653c4f024cdb4b0cb11844e8392e521e 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
@ -67,7 +67,7 @@ index 6c0ef4df..f20104a2 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index 2959d8c0..3376154d 100644
index ee323696..44bec3b5 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -27,6 +27,9 @@ import se.llbit.nbt.Tag;
@ -146,10 +146,10 @@ index 655bcd46..52f76cd9 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 ae3c6a42..690a5c45 100644
index 460a79a1..b0caf6d6 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;
@@ -15,6 +15,8 @@ import java.util.Set;
import java.util.UUID;
import java.util.logging.Level;
import javax.crypto.SecretKey;
@ -158,7 +158,7 @@ index ae3c6a42..690a5c45 100644
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -471,6 +473,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -470,6 +472,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.42.0
2.42.1

8
BungeeCord-Patches/0050-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 525b05ca4be2f52ce7819bda4bc52ddb2868c8cf Mon Sep 17 00:00:00 2001
From 533bf109a98bb35c3e982cfc7b2628dc59c6de23 Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Wed, 22 Apr 2020 14:00:44 +1000
Subject: [PATCH] Add exception reporting event
@ -642,10 +642,10 @@ index 014de202..40792a68 100644
@EventHandler
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 5cc308b8..3a86fac8 100644
index 0646684f..7cd0017d 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -11,6 +11,8 @@ import com.google.gson.Gson;
@@ -10,6 +10,8 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration;
@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.34.1
2.42.1

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

@ -1,14 +1,14 @@
From 9f584ae89fe04e5f5ef05a0273d48f42ea99609c Mon Sep 17 00:00:00 2001
From 2c86c888764bec367f1ff2c240a41d132842733c 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 690a5c45..73aa532e 100644
index b0caf6d6..03608ef1 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
@@ -75,6 +75,8 @@ import net.md_5.bungee.util.QuietException;
@@ -74,6 +74,8 @@ import net.md_5.bungee.util.QuietException;
public class InitialHandler extends PacketHandler implements PendingConnection
{
@ -17,7 +17,7 @@ index 690a5c45..73aa532e 100644
private final BungeeCord bungee;
private ChannelWrapper ch;
@Getter
@@ -499,7 +501,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -498,7 +500,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 690a5c45..73aa532e 100644
Callback<String> handler = new Callback<String>()
{
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From d4a6ec0de8dc598da0bf5e8025112f62a4c5a26a Mon Sep 17 00:00:00 2001
From 5e1364060a35739c23d59c8e6276f28b874ea189 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 73aa532e..40ed5ab0 100644
index 03608ef1..97fcd106 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
@@ -760,9 +760,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -763,9 +763,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
for ( String id : content.split( "\0" ) )
{
@ -101,5 +101,5 @@ index 73aa532e..40ed5ab0 100644
}
} else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From 974b20b184e44b3610e6238526a934bbe1344976 Mon Sep 17 00:00:00 2001
From 746b54287dd1ea4220b97894d61ce24d3cd65edf 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 a25f9e79..c75e9bad 100644
index 1d3b7a9d..6c83039d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -294,12 +294,16 @@ public final class UserConnection implements ProxiedPlayer
@@ -295,12 +295,16 @@ public final class UserConnection implements ProxiedPlayer
connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
}
@ -53,7 +53,7 @@ index a25f9e79..c75e9bad 100644
builder.connectTimeout(timeout); // Waterfall
if ( callback != null )
{
@@ -347,7 +351,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -348,7 +352,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
}
@ -62,7 +62,7 @@ index a25f9e79..c75e9bad 100644
return;
}
if ( pendingConnects.contains( target ) )
@@ -357,7 +361,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -358,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
}
@ -71,7 +71,7 @@ index a25f9e79..c75e9bad 100644
return;
}
@@ -393,14 +397,14 @@ public final class UserConnection implements ProxiedPlayer
@@ -394,14 +398,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 a25f9e79..c75e9bad 100644
}
}
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From 372e00bb354ee567d0d9d8c6831b99538f2224f8 Mon Sep 17 00:00:00 2001
From a00f92b9ec6d2073ae2e4abd426d65d971611907 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 c75e9bad..cbc45c5c 100644
index 6c83039d..553680ee 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -425,7 +425,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -426,7 +426,8 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{
@ -27,5 +27,5 @@ index c75e9bad..cbc45c5c 100644
@Override
--
2.42.0
2.42.1

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

@ -1,14 +1,14 @@
From 9a2cd7e0aef6a7d27f8454e692838944aa5f892a Mon Sep 17 00:00:00 2001
From 071b75b6095cc6c21e8750ad48d74f514c756139 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 40ed5ab0..3000d753 100644
index 97fcd106..9c322fb5 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
@@ -473,6 +473,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -472,6 +472,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 40ed5ab0..3000d753 100644
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
// Waterfall start
@@ -527,7 +528,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -526,7 +527,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
}
};
@ -26,5 +26,5 @@ index 40ed5ab0..3000d753 100644
}
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From cba37fa379053290219c8194dfe9f8da0937fdf8 Mon Sep 17 00:00:00 2001
From eca9314d27830f7af4300fca0330aee48324363b 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 3000d753..4114b4fd 100644
index 9c322fb5..a9358a51 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
@@ -396,6 +396,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -395,6 +395,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
{
@ -32,5 +32,5 @@ index e42b798b..76ad621f 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.42.0
2.42.1

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

@ -1,4 +1,4 @@
From 0f6f4601d455713102ad18766199c7cfb53c8ca1 Mon Sep 17 00:00:00 2001
From caf1fb139eb3ba9276f69084da78e2e79758e6e5 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.
@ -6,7 +6,7 @@ Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
Thanks for pointing it out @MrIvanPlays
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 3a86fac8..a7091ab6 100644
index 7cd0017d..01c8a172 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -358,7 +358,7 @@ public class BungeeCord extends ProxyServer
@ -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 cbc45c5c..0281c393 100644
index 553680ee..2f996a69 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -410,7 +410,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -411,7 +411,7 @@ public final class UserConnection implements ProxiedPlayer
}
};
Bootstrap b = new Bootstrap()
@ -142,5 +142,5 @@ index af65e192..6a045d16 100644
{
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
--
2.42.0
2.42.1

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

@ -1,14 +1,14 @@
From 7863030ffbcdd91ce95a9467b3cbfafab7f3e328 Mon Sep 17 00:00:00 2001
From 7c72b4ab1fd8611e97307dfac87f275187253a45 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 4114b4fd..3e41796e 100644
index a9358a51..5e74d0e2 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
@@ -163,7 +163,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -162,7 +162,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -28,5 +28,5 @@ index 4114b4fd..3e41796e 100644
@Override
--
2.42.0
2.42.1

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

@ -1,4 +1,4 @@
From c89ee9ef58e78c17ce1ecdfb29d7fac311cfc361 Mon Sep 17 00:00:00 2001
From 040e9cf5705093c527b80521d426a67e351728aa 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
@ -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 b9d250d9..05d3a62a 100644
index 05e3bd21..dff5e283 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
@@ -195,10 +195,15 @@ public class UpstreamBridge extends PacketHandler
@@ -194,10 +194,15 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(ClientCommand command) throws Exception
{
@ -111,7 +111,7 @@ index b9d250d9..05d3a62a 100644
{
boolean empty = true;
for ( int index = 0, length = message.length(); index < length; index++ )
@@ -224,6 +229,12 @@ public class UpstreamBridge extends PacketHandler
@@ -223,6 +228,12 @@ public class UpstreamBridge extends PacketHandler
if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) )
{
return message;
@ -125,5 +125,5 @@ index b9d250d9..05d3a62a 100644
}
throw CancelSendSignal.INSTANCE;
--
2.42.0
2.42.1