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

Remove empty chat validation 

it has been a long time and we still have no idea why this exists
bar silencing some warning on certain backend versions.

Closes #465
Fixes #413
This commit is contained in:
Shane Freeder 2024-04-02 18:16:10 +01:00
parent 51f7ed3232
commit a9cb069f22
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
46 changed files with 101 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch → BungeeCord-Patches/0022-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 89741f79f340eefb555ec55efb0eab6a8d3c0ba9 Mon Sep 17 00:00:00 2001
From 578c03f455937272ca3acd2a7dac0bdbbd125412 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -311,5 +311,5 @@ index fea0ec61..37abb3c4 100644
+ // Waterfall end
}
--
2.43.0.windows.1
2.44.0

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

@ -1,36 +0,0 @@
From c2b289e6620daa7c46cad38a419a0e27dce03fbd 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 740c90ec..3084e7e7 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
@@ -207,6 +207,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
+ boolean empty = true;
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -214,8 +215,14 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;
+ } else if (empty && !Character.isWhitespace(c)) {
+ empty = false;
}
}
+ if (empty) {
+ con.disconnect("Chat message is empty");
+ throw CancelSendSignal.INSTANCE;
+ }
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.44.0

4
BungeeCord-Patches/0024-Add-callEvent-shortcut-to-Event.patch → BungeeCord-Patches/0023-Add-callEvent-shortcut-to-Event.patch
View File

@ -1,4 +1,4 @@
From 3c8fdc59280303fcca5b51c9b78fc02a1886e716 Mon Sep 17 00:00:00 2001
From 8808208cba06c28cb25e93de6752e7a0fea63094 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 14 Apr 2019 19:15:00 +0300
Subject: [PATCH] Add callEvent() shortcut to Event
@ -28,5 +28,5 @@ index e2e01ecb..25ec1bd8 100644
+ // Waterfall end
}
--
2.43.0
2.44.0

8
BungeeCord-Patches/0025-Improve-ServerKickEvent.patch → BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 4035759e203567e189c3a3f4dee618f2fb2b8290 Mon Sep 17 00:00:00 2001
From c948a81d4f6604ea281baa2f9a96ac9366ea9e44 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,7 +68,7 @@ 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 e38f52d5..031bf2b1 100644
index e670a57a..307a417b 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
@ -81,7 +81,7 @@ index e38f52d5..031bf2b1 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 976c8e26..7e416a6d 100644
index cd3ed518..d4036c5d 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
@ -147,5 +147,5 @@ index 976c8e26..7e416a6d 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch → BungeeCord-Patches/0025-Configurable-server-version-in-ping-response.patch
View File

@ -1,4 +1,4 @@
From a6120b6e56a8930d336561c0254afae4a66a893a Mon Sep 17 00:00:00 2001
From 841109177468b8cfec9a73b5aa0e3f2bab3e38a3 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response
@ -79,5 +79,5 @@ index 5a3acccf..7e2688ee 100644
@Override
--
2.43.0
2.44.0

4
BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch → BungeeCord-Patches/0026-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From 5b69d2ace775a1dcbaa90faecdd258efd3f8ac87 Mon Sep 17 00:00:00 2001
From c489acf737b0340bc283c49f39517a14736a58a1 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
@ -109,5 +109,5 @@ index c8d5648c..7e36c0eb 100644
{
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0028-Proxy-query-event.patch → BungeeCord-Patches/0027-Proxy-query-event.patch
View File

@ -1,4 +1,4 @@
From 4af8c13703df60875533f0973f228ed8663e97fe Mon Sep 17 00:00:00 2001
From 2fd518610d983a1b9a721c77588cbbedf059a507 Mon Sep 17 00:00:00 2001
From: minecrafter <unknown@unknown>
Date: Sun, 3 Jul 2016 04:03:21 -0400
Subject: [PATCH] Proxy query event
@ -211,5 +211,5 @@ index 9b81197f..ac99d02c 100644
} else
{
--
2.43.0
2.44.0

4
BungeeCord-Patches/0029-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch → BungeeCord-Patches/0028-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch
View File

@ -1,4 +1,4 @@
From 97625eccc25929d5d7d83f56648cebf15949af9c Mon Sep 17 00:00:00 2001
From 26e5efd5327231309bb9dcfc080e59baec9d6767 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 4 Aug 2016 19:30:49 -0700
Subject: [PATCH] Dump the raw hex of a packet on a decoding error
@ -53,5 +53,5 @@ index 250e7620..2207c3ff 100644
{
if ( slice != null )
--
2.43.0
2.44.0

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

@ -1,4 +1,4 @@
From 26a6b2a630825182a7712505f7212c1bf397d446 Mon Sep 17 00:00:00 2001
From bf5145136df8e794c207bb4c8c49c02dbf26eb6d 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

6
BungeeCord-Patches/0031-Optionally-use-async-Netty-DNS-resolver.patch → BungeeCord-Patches/0030-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From 8710865be33599b4d0212dcedd6587a601ac6d9d Mon Sep 17 00:00:00 2001
From 2bf7abb9ebc40d15e934aa076b27cbf421e5278e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -24,7 +24,7 @@ index 749059ab..6141128b 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index fe1506e4..18a5c526 100644
index be212472..1d2b4ec9 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -34,6 +34,18 @@
@ -175,5 +175,5 @@ index e0c52f21..37337429 100644
+ // Waterfall End
}
--
2.43.0
2.44.0

4
BungeeCord-Patches/0032-Improve-outdated-build-message.patch → BungeeCord-Patches/0031-Improve-outdated-build-message.patch
View File

@ -1,4 +1,4 @@
From fde062d7618ef25c070e9c58ddc83b122fb528ae Mon Sep 17 00:00:00 2001
From 327b543e487371de8d71f63218e9abdbb98f64d1 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 10 Jun 2017 20:56:02 +0100
Subject: [PATCH] Improve outdated build message
@ -26,5 +26,5 @@ index 39fc55f9..c81a4430 100644
}
--
2.43.0
2.44.0

4
BungeeCord-Patches/0033-Fix-some-forge-plugin-message-packets-not-being-forw.patch → BungeeCord-Patches/0032-Fix-some-forge-plugin-message-packets-not-being-forw.patch
View File

@ -1,4 +1,4 @@
From d6f4754d7bbbc92d84ccce081c3a62318a445ae4 Mon Sep 17 00:00:00 2001
From 41dec9006eb4326433c948bfbdb271e353d066b2 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Mon, 17 Jul 2017 20:24:17 +0100
Subject: [PATCH] Fix some forge plugin message packets not being forwarded
@ -55,5 +55,5 @@ index 77d18e6d..d254b84e 100644
synchronized ( packetQueue )
{
--
2.43.0
2.44.0

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

@ -1,4 +1,4 @@
From a7fd6d9b2d176e4f7f9e1c226e1e6e06103e20b8 Mon Sep 17 00:00:00 2001
From 96ff42638e839e92b966aaa95a50f8ee81cd16ea 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
@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 348ac8ef..187c2138 100644
index 15546f07..5182b664 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -233,7 +233,7 @@ index 00000000..cfd039cd
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index 18b596f2..c31408a8 100644
index 87ab1b76..f8491614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,12 +48,13 @@
@ -1629,5 +1629,5 @@ index 21a48df6..00000000
-
-}
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0035-Handle-plugin-prefixes-using-Log4J.patch → BungeeCord-Patches/0034-Handle-plugin-prefixes-using-Log4J.patch
View File

@ -1,4 +1,4 @@
From 1761a7f440d7e4fab7ad1dcda8117fe27eed1a1c Mon Sep 17 00:00:00 2001
From eb16c1d6d89af2880d5f990ff91c661d4990fcf1 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:07:31 +0200
Subject: [PATCH] Handle plugin prefixes using Log4J
@ -45,5 +45,5 @@ index cfd039cd..8e49e002 100644
<TimeBasedTriggeringPolicy />
<OnStartupTriggeringPolicy />
--
2.43.0
2.44.0

6
BungeeCord-Patches/0036-Allow-plugins-to-use-SLF4J-for-logging.patch → BungeeCord-Patches/0035-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,4 +1,4 @@
From efedb4d256c3adada74d8ff5af2434c11e25840b Mon Sep 17 00:00:00 2001
From 744e3eab49b9499e6862219c0e051bccf115e03a Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
@ -23,7 +23,7 @@ index 9660234d..3d1e9a3a 100644
* Called when the plugin has just been loaded. Most of the proxy will not
* be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml
index f9a169cc..6d20191e 100644
index 4bb98d5a..f9bdf71f 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -38,6 +38,24 @@
@ -52,5 +52,5 @@ index f9a169cc..6d20191e 100644
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.43.0
2.44.0

4
BungeeCord-Patches/0037-Add-Log4j-configuration-that-replicates-the-old-Bung.patch → BungeeCord-Patches/0036-Add-Log4j-configuration-that-replicates-the-old-Bung.patch
View File

@ -1,4 +1,4 @@
From 2dd371eeceaa3d8fe8adf4b1041cf31890042370 Mon Sep 17 00:00:00 2001
From f7d596841b8aff48baf598155d80ec2da93a7f3f Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Sun, 24 Sep 2017 12:06:49 +0200
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
@ -47,5 +47,5 @@ index 00000000..6e9c09c5
+ </Loggers>
+</Configuration>
--
2.43.0
2.44.0

4
BungeeCord-Patches/0038-Add-console-command-completion.patch → BungeeCord-Patches/0037-Add-console-command-completion.patch
View File

@ -1,4 +1,4 @@
From 10d0cd9245b3f75c26efd0b594ec019cb95876d0 Mon Sep 17 00:00:00 2001
From 901eb492361fe718242f5b038f80c06a7f1b01b2 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion
@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
}
--
2.43.0
2.44.0

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

@ -1,4 +1,4 @@
From f5bfae46f8cd47ff456069b21862f6efad233421 Mon Sep 17 00:00:00 2001
From 6568f09ce8c2d9ad4743de43363784c40c3bce11 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
@ -64,5 +64,5 @@ index b7dd5fe3..5fd26bf1 100644
private void finish2()
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch → BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From 00cda9eb01af461e5569795a0c93db9e6cb565a0 Mon Sep 17 00:00:00 2001
From a3bcb041e962b0aa7a546f475a52fb12ab6403f4 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
@ -77,5 +77,5 @@ index 5fd26bf1..ccc80506 100644
ch.setProtocol( Protocol.LOGIN );
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch → BungeeCord-Patches/0040-Forge-is-a-first-class-citizen.patch
View File

@ -1,4 +1,4 @@
From 1c86494fe0900cb9dd18d095d8d79c2532349d59 Mon Sep 17 00:00:00 2001
From 91929d2d6f6d32b63dd65b38fa1f1dd8ba39d55a Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen
@ -32,5 +32,5 @@ index 37abb3c4..a468c5c4 100644
@Synchronized("serversLock") // Waterfall
public void load()
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0042-Ignore-empty-packets.patch → BungeeCord-Patches/0041-Ignore-empty-packets.patch
View File

@ -1,4 +1,4 @@
From 075bc35b82064130e9b8b5919e62eb05c74fc778 Mon Sep 17 00:00:00 2001
From 49038909ac940a1e6ccda7dd8d71fedf71f3bdb9 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 12 Oct 2018 14:28:52 +0100
Subject: [PATCH] Ignore empty packets
@ -38,5 +38,5 @@ index 277e70e8..cf7dea17 100644
throw new CorruptedFrameException( "Empty Packet!" );
}
--
2.43.0
2.44.0

4
BungeeCord-Patches/0043-Don-t-use-a-bytebuf-for-packet-decoding.patch → BungeeCord-Patches/0042-Don-t-use-a-bytebuf-for-packet-decoding.patch
View File

@ -1,4 +1,4 @@
From 145c6a12317d0d9ec49a7902a461de1a178632f5 Mon Sep 17 00:00:00 2001
From 3168598e19fb93e789d66b9434815a8121b59b14 Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Thu, 17 Jan 2019 03:25:59 +0000
Subject: [PATCH] Don't use a bytebuf for packet decoding
@ -66,5 +66,5 @@ index cf7dea17..3a802ca4 100644
}
}
--
2.43.0
2.44.0

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

@ -1,4 +1,4 @@
From a43f0b8886740a47f470609a8325528f2896739a Mon Sep 17 00:00:00 2001
From 205d40bd64875c6ae94ce8c9e9c66ddfc13c6089 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,7 +57,7 @@ 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 031bf2b1..5fc9324e 100644
index 307a417b..43d13e36 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
@ -137,7 +137,7 @@ index 86223e17..ee527938 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 8a10b057..249c3f46 100644
index ad9fc042..6ed25f82 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
@ -225,5 +225,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.43.0.windows.1
2.44.0

6
BungeeCord-Patches/0045-Add-ProxyDefineCommandsEvent.patch → BungeeCord-Patches/0044-Add-ProxyDefineCommandsEvent.patch
View File

@ -1,4 +1,4 @@
From 567777504ad1b5abb4388b7764945d9279c2f3b7 Mon Sep 17 00:00:00 2001
From 8c33d4de8183d34c90460a315ad42307e731c4dc Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 14 Mar 2019 07:44:06 +0000
Subject: [PATCH] Add ProxyDefineCommandsEvent
@ -54,7 +54,7 @@ index 00000000..1fd4fc90
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 249c3f46..42232443 100644
index 6ed25f82..1a863dc0 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
@ -86,5 +86,5 @@ index 249c3f46..42232443 100644
CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
.then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
--
2.43.0
2.44.0

4
BungeeCord-Patches/0046-Fix-upstream-javadocs.patch → BungeeCord-Patches/0045-Fix-upstream-javadocs.patch
View File

@ -1,4 +1,4 @@
From b0e90afad7bbcfd7bf60bcf6c218014933e39693 Mon Sep 17 00:00:00 2001
From 0a1e7a3cf67d728ae3daab2bbf0fede1f2d38bf7 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 30 Mar 2019 15:11:11 +0000
Subject: [PATCH] Fix upstream javadocs
@ -104,5 +104,5 @@ index f3bced0a..4a198ee9 100644
Favicon getFaviconObject();
--
2.43.0
2.44.0

4
BungeeCord-Patches/0047-OSX-native-zlib-and-crypto.patch → BungeeCord-Patches/0046-OSX-native-zlib-and-crypto.patch
View File

@ -1,4 +1,4 @@
From bc847940495ff523e90196d7f6eaa7cfbed5e974 Mon Sep 17 00:00:00 2001
From abcba7789455d7b64aa0d2d9d7b51c5e411dce3c Mon Sep 17 00:00:00 2001
From: Colin Godsey <crgodsey@gmail.com>
Date: Tue, 16 Apr 2019 07:25:52 -0600
Subject: [PATCH] OSX native zlib and crypto
@ -1215,5 +1215,5 @@ literal 0
HcmV?d00001
--
2.43.0
2.44.0

4
BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch → BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From 35d2dacf92f05fdb842310189d371971ee72e7a8 Mon Sep 17 00:00:00 2001
From 6813e1365f919ea61338f6201b3ff516ec958752 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
@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0049-ConnectionInitEvent.patch → BungeeCord-Patches/0048-ConnectionInitEvent.patch
View File

@ -1,4 +1,4 @@
From 25481b9d5076273cd88202d69c10da6ed9767f5a Mon Sep 17 00:00:00 2001
From 838b44a67a3b27848d8185e5114e2dc9f8067afc Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 2 Dec 2019 11:35:17 +0000
Subject: [PATCH] ConnectionInitEvent
@ -119,5 +119,5 @@ index 3f30da0c..af65e192 100644
};
public static final Base BASE = new Base( false );
--
2.43.0
2.44.0

4
BungeeCord-Patches/0050-Add-exception-reporting-event.patch → BungeeCord-Patches/0049-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 02621fa4a5ab0baf0b146b4e0d50c037b1bbcbac Mon Sep 17 00:00:00 2001
From 21306c26f7c8a4074c9a3d5fbe1991a1d00efb52 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
@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.43.0
2.44.0

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

@ -1,4 +1,4 @@
From b5665dfdc09e8f793fef67533e0b7bc77696e86f Mon Sep 17 00:00:00 2001
From 2ee860a1e91e6e08c061c0338dc60458afe618ca 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,7 +50,7 @@ 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 42232443..747916d1 100644
index 1a863dc0..d5405b90 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
@ -71,5 +71,5 @@ index 42232443..747916d1 100644
@Override
--
2.43.0
2.44.0

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

@ -1,11 +1,11 @@
From 3ae80dc780d68cd1701951509a5e6b880e2f9943 Mon Sep 17 00:00:00 2001
From c702bcf84aeca3cc1e1791ef19e081b8e2df64d0 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 747916d1..d0496ab4 100644
index d5405b90..3bca89be 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
@ -18,5 +18,5 @@ index 747916d1..d0496ab4 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.43.0
2.44.0

4
BungeeCord-Patches/0053-Add-auth-url-option.patch → BungeeCord-Patches/0052-Add-auth-url-option.patch
View File

@ -1,4 +1,4 @@
From a76ed2e6cec8c74791a1004e8cd4170b433b16b1 Mon Sep 17 00:00:00 2001
From f1aae6c964dfc1b53891c412dbf2073e48f4ef36 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
@ -27,5 +27,5 @@ index d8d65093..ffb078d6 100644
Callback<String> handler = new Callback<String>()
{
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0054-Add-the-ability-to-generate-decoder-traces-for-debug.patch → BungeeCord-Patches/0053-Add-the-ability-to-generate-decoder-traces-for-debug.patch
View File

@ -1,4 +1,4 @@
From 745a896d569b83098283b675577e16baf2255c0a Mon Sep 17 00:00:00 2001
From eb138070bd28e41a49e7a750af37a0976d5f7e23 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 15 Sep 2020 18:11:49 +0100
Subject: [PATCH] Add the ability to generate decoder traces for debugging
@ -40,5 +40,5 @@ index 2583aa2c..334d5054 100644
}
}
--
2.43.0
2.44.0

4
BungeeCord-Patches/0055-Additional-DoS-mitigations.patch → BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
View File

@ -1,4 +1,4 @@
From ce7a08d595ba0ddeb36f29c728d681ef82bac66e Mon Sep 17 00:00:00 2001
From 9510b1e224526e367d4b2dd77856336a5ed75493 Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@fivepb.me>
Date: Sat, 30 Jan 2021 18:04:14 +0100
Subject: [PATCH] Additional DoS mitigations
@ -257,5 +257,5 @@ index 738f0c92..ec33d337 100644
+ // Waterfall end
}
--
2.43.0
2.44.0

4
BungeeCord-Patches/0056-Add-support-for-hex-color-codes-in-console.patch → BungeeCord-Patches/0055-Add-support-for-hex-color-codes-in-console.patch
View File

@ -1,4 +1,4 @@
From 24d69fc033d978cadcc6b0ec63bf305f1b6353c3 Mon Sep 17 00:00:00 2001
From d748b38a6bfbafd428342cac2a8cdff6fe1be782 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Sun, 21 Feb 2021 23:52:11 -0500
Subject: [PATCH] Add support for hex color codes in console
@ -242,5 +242,5 @@ index 00000000..5d1a6126
+}
+
--
2.43.0
2.44.0

4
BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch → BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
View File

@ -1,4 +1,4 @@
From 32dab04e234232ee5f41fbb099314ded4db6f253 Mon Sep 17 00:00:00 2001
From 8eda531051300bfd546f283c371ea52d863e800f 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
@ -101,5 +101,5 @@ index ffb078d6..bb9063f6 100644
}
} else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch → BungeeCord-Patches/0057-ServerConnectRequest-sendFeedback.patch
View File

@ -1,4 +1,4 @@
From 798c4a8872b81f0bc4937528443943757d7af13a Mon Sep 17 00:00:00 2001
From 63ef97642f82dd1c190d47cc6b58a42fada64c2d 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
@ -90,5 +90,5 @@ index ee527938..2813c16f 100644
}
}
--
2.43.0.windows.1
2.44.0

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

@ -1,4 +1,4 @@
From 91068a14930a6dea6267c8cc6c435b555d3d9b32 Mon Sep 17 00:00:00 2001
From 7cec69fe57fe38d7ce33e58023d690f9ade8219a 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
@ -27,5 +27,5 @@ index 2813c16f..f29a6f62 100644
@Override
--
2.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0060-Improve-login-state-transition.patch → BungeeCord-Patches/0059-Improve-login-state-transition.patch
View File

@ -1,4 +1,4 @@
From 76146d50f70765ba260304699679fbd71f23c7c4 Mon Sep 17 00:00:00 2001
From f97fb438b8ac483a526e36da5af9728bbb306b20 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
@ -26,5 +26,5 @@ index bb9063f6..f5959b66 100644
}
--
2.43.0.windows.1
2.44.0

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

@ -1,4 +1,4 @@
From a19eb650fe93a822c0387553200ca16fa1c6643d Mon Sep 17 00:00:00 2001
From 788bf1c83bc29931fa2205fe3c804b0e8a3a59ba 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

4
BungeeCord-Patches/0062-Expand-packet-decode-logging-usage.patch → BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch
View File

@ -1,4 +1,4 @@
From 87bdfba145d386f2a2e023a3247cd9f98568d72e Mon Sep 17 00:00:00 2001
From 76c901d6879fc774867b51da71abb31c10bdc8ab Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 19 Jun 2022 10:31:51 +0100
Subject: [PATCH] Expand packet-decode-logging usage
@ -24,5 +24,5 @@ index 206f4227..954ffbc9 100644
{
ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[]
--
2.43.0
2.44.0

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

@ -1,4 +1,4 @@
From e7688bc1a3e0fbb881635096f464772f804ec2be Mon Sep 17 00:00:00 2001
From b8e82d2bdf3c1b23c0338fc239357eb7dc626f1f 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
@ -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.43.0.windows.1
2.44.0

4
BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch → BungeeCord-Patches/0063-Replace-reflection-inside-netty-with-ChannelFactory.patch
View File

@ -1,4 +1,4 @@
From bae0045a3b7394ba2071ab4e5ac2d7fe8fa5a157 Mon Sep 17 00:00:00 2001
From 25abd4454ef1e0caeeaad0e21866e8612528d916 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.
@ -142,5 +142,5 @@ index af65e192..6a045d16 100644
{
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
--
2.43.0.windows.1
2.44.0

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

@ -1,4 +1,4 @@
From 9605eefddbd1ad1ac004c9e12f9e9b8e239623ee Mon Sep 17 00:00:00 2001
From de091e83ba1da7002ffd7b951231c69da7a4ec7c 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
@ -28,5 +28,5 @@ index 72d48c72..0b5bee55 100644
@Override
--
2.43.0.windows.1
2.44.0

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

@ -1,4 +1,4 @@
From 89d615e5423ffd5ff38790c6cbea9eb93e53b307 Mon Sep 17 00:00:00 2001
From 3b82a10c1ff1eacc4d4fa7d7fe16496c570c5662 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,7 +90,7 @@ index fb53ba74..f8e2db8d 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 3084e7e7..333db20f 100644
index 740c90ec..134a843f 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
@ -116,9 +116,9 @@ index 3084e7e7..333db20f 100644
+ private String handleChat(String message, @javax.annotation.Nullable ClientCommand clientCommand, @javax.annotation.Nullable ClientCommandSigned clientCommandSigned)
+ // Waterfall end
{
boolean empty = true;
for ( int index = 0, length = message.length(); index < length; index++ )
@@ -231,7 +237,18 @@ public class UpstreamBridge extends PacketHandler
{
@@ -224,7 +230,18 @@ public class UpstreamBridge extends PacketHandler
if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) )
{
return message;

4
BungeeCord-Patches/0067-eol-message.patch → BungeeCord-Patches/0066-eol-message.patch
View File

@ -1,4 +1,4 @@
From f61e1e636169079ed0987cfc28a106a6007a9de3 Mon Sep 17 00:00:00 2001
From 168aca2c4cae1c77efbbd156345ead5234c113ab Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@benndorf.dev>
Date: Fri, 22 Mar 2024 09:20:53 +0100
Subject: [PATCH] eol message
@ -17,5 +17,5 @@ index 96a9998d..72d6a15d 100644
if ( !options.has( "noconsole" ) )
--
2.42.0
2.44.0