From 177f36ae1a21b8aa1855598720da75b72d78e0b9 Mon Sep 17 00:00:00 2001 From: linsaftw Date: Thu, 11 Apr 2024 10:29:11 -0300 Subject: [PATCH] Updated Upstream (BungeeCord) --- BungeeCord | 2 +- BungeeCord-Patches/0001-POM-Changes.patch | 138 +++++++++--------- .../0002-Copy-license-files-into-jar.patch | 8 +- ...erences-from-BungeeCord-to-Waterfall.patch | 10 +- ...04-Add-Waterfall-configuration-files.patch | 10 +- BungeeCord-Patches/0005-Disable-Metrics.patch | 12 +- .../0007-Fixup-ProtocolConstants.patch | 8 +- ...-access-a-ByteBuf-s-underlying-array.patch | 14 +- .../0010-Optimize-uuid-conversions.patch | 8 +- ...t-for-FML-with-IP-Forwarding-enabled.patch | 12 +- .../0012-Better-unit-tests-for-Chat-API.patch | 14 +- ...ervers-or-changing-addresses-on-relo.patch | 8 +- .../0014-Enable-TCP_NODELAY.patch | 8 +- ...invalid-packet-ids-for-forge-servers.patch | 16 +- ...t-for-configurable-tab-complete-thro.patch | 10 +- ...018-Improve-server-list-ping-logging.patch | 18 +-- ...perty-to-accept-invalid-ping-packets.patch | 8 +- ...a-worker-and-a-boss-event-loop-group.patch | 16 +- ...ate-that-chat-messages-are-non-blank.patch | 10 +- ...-dynamic-server-addition-removal-api.patch | 18 +-- .../0025-Improve-ServerKickEvent.patch | 10 +- ...able-server-version-in-ping-response.patch | 8 +- ...d-timeout-variant-to-connect-methods.patch | 16 +- ...potion-race-condition-on-Forge-1.8.9.patch | 18 +-- ...ogging-and-TerminalConsoleAppender-f.patch | 34 ++--- ...-to-the-player-s-LoginResult-on-Logi.patch | 8 +- ...nally-log-InitialHandler-connections.patch | 12 +- .../0041-Forge-is-a-first-class-citizen.patch | 13 +- ...n-to-disable-entity-metadata-rewriti.patch | 31 ++-- ...0048-Speed-up-some-common-exceptions.patch | 24 +-- .../0049-ConnectionInitEvent.patch | 12 +- .../0050-Add-exception-reporting-event.patch | 8 +- .../0053-Add-auth-url-option.patch | 10 +- .../0055-Additional-DoS-mitigations.patch | 12 +- ...Configurable-plugin-messaging-limits.patch | 8 +- ...58-ServerConnectRequest-sendFeedback.patch | 14 +- ...tions-to-the-client-during-kicks-etc.patch | 8 +- .../0060-Improve-login-state-transition.patch | 10 +- ...-version-to-packet-not-found-message.patch | 8 +- ...outdated-clients-that-don-t-support-.patch | 10 +- ...ion-inside-netty-with-ChannelFactory.patch | 28 ++-- ...from-clients-registeirng-too-many-ch.patch | 8 +- ...mmands-from-breaking-the-chat-chain-.patch | 31 ++-- 43 files changed, 347 insertions(+), 342 deletions(-) diff --git a/BungeeCord b/BungeeCord index 708c5b625..5e25c63c5 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 708c5b62545cff0965b6a0d66b2f69b75506fa0b +Subproject commit 5e25c63c5a2a40026d5b441fc0809172328aa328 diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch index e03358e9c..f571e9256 100644 --- a/BungeeCord-Patches/0001-POM-Changes.patch +++ b/BungeeCord-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 9ae84f2bd8435cc04badeccfde4fc367b42f6ca3 Mon Sep 17 00:00:00 2001 +From 2f67473386fb86d0610beebb04fa229df13abc8e Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 19:33:31 +0200 Subject: [PATCH] POM Changes @@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes - Deploy to papermc mvn repo diff --git a/api/pom.xml b/api/pom.xml -index 57567988..3cd57d98 100644 +index 4f520c31..d125f700 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,42 +4,42 @@ @@ -16,10 +16,10 @@ index 57567988..3cd57d98 100644 - net.md-5 - bungeecord-parent -- 1.20-R0.2-SNAPSHOT +- 1.20-R0.3-SNAPSHOT + io.github.waterfallmc + waterfall-parent -+ 1.20-R0.2-SNAPSHOT ++ 1.20-R0.3-SNAPSHOT ../pom.xml @@ -27,7 +27,7 @@ index 57567988..3cd57d98 100644 - bungeecord-api + io.github.waterfallmc + waterfall-api - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-API @@ -68,7 +68,7 @@ index 57567988..3cd57d98 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index 2b80f83b..fc09cc11 100644 +index 4dbf5e29..15546f07 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,39 +4,40 @@ @@ -79,7 +79,7 @@ index 2b80f83b..fc09cc11 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -87,7 +87,7 @@ index 2b80f83b..fc09cc11 100644 - bungeecord-bootstrap + io.github.waterfallmc + waterfall-bootstrap - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Bootstrap @@ -146,7 +146,7 @@ index 6be22739..a4516ed9 100644 return; } diff --git a/chat/pom.xml b/chat/pom.xml -index 87c2beb1..2aa2ad55 100644 +index 4239d5a1..3cfa8ac3 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,19 +4,19 @@ @@ -157,7 +157,7 @@ index 87c2beb1..2aa2ad55 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -165,7 +165,7 @@ index 87c2beb1..2aa2ad55 100644 - bungeecord-chat + io.github.waterfallmc + waterfall-chat - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Chat @@ -176,7 +176,7 @@ index 87c2beb1..2aa2ad55 100644 diff --git a/config/pom.xml b/config/pom.xml -index 06d2e13b..058e6fa8 100644 +index e7a474c6..13b2481d 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,19 +4,19 @@ @@ -187,7 +187,7 @@ index 06d2e13b..058e6fa8 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -195,7 +195,7 @@ index 06d2e13b..058e6fa8 100644 - bungeecord-config + io.github.waterfallmc + waterfall-config - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Config @@ -206,7 +206,7 @@ index 06d2e13b..058e6fa8 100644 diff --git a/event/pom.xml b/event/pom.xml -index 13e71066..316f1e35 100644 +index 1f36ab90..120d21b2 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -4,17 +4,17 @@ @@ -217,7 +217,7 @@ index 13e71066..316f1e35 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -225,7 +225,7 @@ index 13e71066..316f1e35 100644 - bungeecord-event + io.github.waterfallmc + waterfall-event - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Event @@ -234,7 +234,7 @@ index 13e71066..316f1e35 100644 + Generic java event dispatching API intended for use with Waterfall. diff --git a/log/pom.xml b/log/pom.xml -index 47eb961c..9ee30d66 100644 +index 1e2f2e96..09b75466 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -4,19 +4,19 @@ @@ -245,7 +245,7 @@ index 47eb961c..9ee30d66 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -253,7 +253,7 @@ index 47eb961c..9ee30d66 100644 - bungeecord-log + io.github.waterfallmc + waterfall-log - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Log @@ -275,7 +275,7 @@ index 47eb961c..9ee30d66 100644 compile diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml -index e63a1dfb..2016f6a1 100644 +index 62e1f137..095368b4 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -4,14 +4,14 @@ @@ -286,7 +286,7 @@ index e63a1dfb..2016f6a1 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -294,11 +294,11 @@ index e63a1dfb..2016f6a1 100644 - bungeecord-module-cmd-alert + io.github.waterfallmc + waterfall-module-cmd-alert - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml -index 60b69834..7371de6a 100644 +index 5ca1b4c3..6bf9bdcf 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -4,14 +4,14 @@ @@ -309,7 +309,7 @@ index 60b69834..7371de6a 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -317,11 +317,11 @@ index 60b69834..7371de6a 100644 - bungeecord-module-cmd-find + io.github.waterfallmc + waterfall-module-cmd-find - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml -index 822babc6..9fac0511 100644 +index 2a498c05..5e5cab83 100644 --- a/module/cmd-kick/pom.xml +++ b/module/cmd-kick/pom.xml @@ -4,14 +4,14 @@ @@ -332,7 +332,7 @@ index 822babc6..9fac0511 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -340,11 +340,11 @@ index 822babc6..9fac0511 100644 - bungeecord-module-cmd-kick + io.github.waterfallmc + waterfall-module-cmd-kick - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml -index ba861252..d7324d89 100644 +index 99090af7..670a55f4 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -4,14 +4,14 @@ @@ -355,7 +355,7 @@ index ba861252..d7324d89 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -363,11 +363,11 @@ index ba861252..d7324d89 100644 - bungeecord-module-cmd-list + io.github.waterfallmc + waterfall-module-cmd-list - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml -index 1a62e71d..00539f37 100644 +index 5aee8173..6c65d8f4 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -4,14 +4,14 @@ @@ -378,7 +378,7 @@ index 1a62e71d..00539f37 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -386,11 +386,11 @@ index 1a62e71d..00539f37 100644 - bungeecord-module-cmd-send + io.github.waterfallmc + waterfall-module-cmd-send - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml -index 57cbf1e9..6785f2a0 100644 +index d33200e2..dc3af35e 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -4,14 +4,14 @@ @@ -401,7 +401,7 @@ index 57cbf1e9..6785f2a0 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -409,11 +409,11 @@ index 57cbf1e9..6785f2a0 100644 - bungeecord-module-cmd-server + io.github.waterfallmc + waterfall-module-cmd-server - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar diff --git a/module/pom.xml b/module/pom.xml -index b1fd5afd..d78c9a25 100644 +index 21ba8f2b..baa24b7d 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -4,19 +4,19 @@ @@ -424,7 +424,7 @@ index b1fd5afd..d78c9a25 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -432,7 +432,7 @@ index b1fd5afd..d78c9a25 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT pom - BungeeCord Modules @@ -462,7 +462,7 @@ index b1fd5afd..d78c9a25 100644 compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml -index cf663eec..a426476d 100644 +index e3a077f3..7d8cf5c4 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -4,14 +4,14 @@ @@ -473,7 +473,7 @@ index cf663eec..a426476d 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -481,11 +481,11 @@ index cf663eec..a426476d 100644 - bungeecord-module-reconnect-yaml + io.github.waterfallmc + waterfall-module-reconnect-yaml - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar diff --git a/native/pom.xml b/native/pom.xml -index a4265e54..5e9d29d7 100644 +index 56d505ab..f7bae2fe 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -4,19 +4,19 @@ @@ -496,7 +496,7 @@ index a4265e54..5e9d29d7 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -504,7 +504,7 @@ index a4265e54..5e9d29d7 100644 - bungeecord-native + io.github.waterfallmc + waterfall-native - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Native @@ -515,7 +515,7 @@ index a4265e54..5e9d29d7 100644 diff --git a/pom.xml b/pom.xml -index 6790d07b..3e08cb3c 100644 +index 5ceacdd8..58367c45 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,25 @@ @@ -533,7 +533,7 @@ index 6790d07b..3e08cb3c 100644 + + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT pom - BungeeCord-Parent @@ -612,7 +612,7 @@ index 6790d07b..3e08cb3c 100644 -@@ -143,12 +158,21 @@ +@@ -149,12 +164,21 @@ @@ -620,7 +620,7 @@ index 6790d07b..3e08cb3c 100644 org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 + maven-javadoc-plugin @@ -634,7 +634,7 @@ index 6790d07b..3e08cb3c 100644 org.apache.maven.plugins maven-checkstyle-plugin 3.3.1 -@@ -173,6 +197,7 @@ +@@ -179,6 +203,7 @@ @@ -642,7 +642,7 @@ index 6790d07b..3e08cb3c 100644 org.codehaus.mojo animal-sniffer-maven-plugin -@@ -285,6 +310,15 @@ +@@ -291,6 +316,15 @@ @@ -658,7 +658,7 @@ index 6790d07b..3e08cb3c 100644 org.projectlombok -@@ -333,6 +367,7 @@ +@@ -339,6 +373,7 @@ none ${project.build.directory}/delombok @@ -667,7 +667,7 @@ index 6790d07b..3e08cb3c 100644 diff --git a/protocol/pom.xml b/protocol/pom.xml -index 4d611101..76a3510d 100644 +index 6f5acbc2..db62c340 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -4,19 +4,19 @@ @@ -678,7 +678,7 @@ index 4d611101..76a3510d 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -686,7 +686,7 @@ index 4d611101..76a3510d 100644 - bungeecord-protocol + io.github.waterfallmc + waterfall-protocol - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Protocol @@ -708,7 +708,7 @@ index 4d611101..76a3510d 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index 92d9d2fa..d1c4570d 100644 +index 574e36c9..63bc0b32 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ @@ -719,7 +719,7 @@ index 92d9d2fa..d1c4570d 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -727,7 +727,7 @@ index 92d9d2fa..d1c4570d 100644 - bungeecord-proxy + io.github.waterfallmc + waterfall-proxy - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Proxy @@ -735,8 +735,8 @@ index 92d9d2fa..d1c4570d 100644 Proxy component of the Elastic Portal Suite -@@ -52,38 +52,38 @@ - compile +@@ -64,38 +64,38 @@ + linux-aarch_64 - net.md-5 @@ -787,7 +787,7 @@ index 92d9d2fa..d1c4570d 100644 compile diff --git a/query/pom.xml b/query/pom.xml -index edd3e11a..4e9bd6cc 100644 +index e07828dd..4b6fdfc2 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -4,19 +4,19 @@ @@ -798,7 +798,7 @@ index edd3e11a..4e9bd6cc 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT ../pom.xml @@ -806,7 +806,7 @@ index edd3e11a..4e9bd6cc 100644 - bungeecord-query + io.github.waterfallmc + waterfall-query - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-Query @@ -828,7 +828,7 @@ index edd3e11a..4e9bd6cc 100644 compile diff --git a/slf4j/pom.xml b/slf4j/pom.xml -index acb5201f..b7529bf3 100644 +index 3b944b85..6d30d554 100644 --- a/slf4j/pom.xml +++ b/slf4j/pom.xml @@ -4,18 +4,18 @@ @@ -837,7 +837,7 @@ index acb5201f..b7529bf3 100644 - net.md-5 - bungeecord-parent -- 1.20-R0.2-SNAPSHOT +- 1.20-R0.3-SNAPSHOT + io.github.waterfallmc + waterfall-super + dev-SNAPSHOT @@ -848,7 +848,7 @@ index acb5201f..b7529bf3 100644 - bungeecord-slf4j + io.github.waterfallmc + waterfall-slf4j - 1.20-R0.2-SNAPSHOT + 1.20-R0.3-SNAPSHOT jar - BungeeCord-SLF4J @@ -857,5 +857,5 @@ index acb5201f..b7529bf3 100644 -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch index b1089d1fb..0d5ca2971 100644 --- a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch +++ b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch @@ -1,14 +1,14 @@ -From 42086afe5cb8e7ec279421c3caf74fdf0ebbc413 Mon Sep 17 00:00:00 2001 +From 7f56e8edd14097b009abaf83b16abd16c0c226c2 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 18 Jul 2018 20:23:03 +0300 Subject: [PATCH] Copy license files into jar diff --git a/proxy/pom.xml b/proxy/pom.xml -index d1c4570d..fe1506e4 100644 +index 63bc0b32..a70f8c5c 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml -@@ -119,4 +119,26 @@ +@@ -131,4 +131,26 @@ runtime @@ -36,5 +36,5 @@ index d1c4570d..fe1506e4 100644 + -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch b/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch index 37624bc5e..4869a3880 100644 --- a/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch +++ b/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch @@ -1,4 +1,4 @@ -From 50d10b53f384abd66b95bc44162db95203d97488 Mon Sep 17 00:00:00 2001 +From 9f2beacaa2344cbd56bb1ba6e60e9988e21a3f18 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 11:28:45 -0700 Subject: [PATCH] Rename references from BungeeCord to Waterfall @@ -18,10 +18,10 @@ index f1ccd4f6..d703d6d2 100644 } 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 2024149f..db2a1b99 100644 +index e7f3f09a..0bf89f1c 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -189,7 +189,7 @@ public class BungeeCord extends ProxyServer +@@ -192,7 +192,7 @@ public class BungeeCord extends ProxyServer public BungeeCord() throws IOException { // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up. @@ -30,7 +30,7 @@ index 2024149f..db2a1b99 100644 reloadMessages(); -@@ -538,7 +538,7 @@ public class BungeeCord extends ProxyServer +@@ -541,7 +541,7 @@ public class BungeeCord extends ProxyServer @Override public String getName() { @@ -101,5 +101,5 @@ index de85f0b2..b9e99d6c 100644 SocketAddress address = Util.getAddr( addr ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch index ae28ebdb5..cecc0cab2 100644 --- a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch +++ b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch @@ -1,4 +1,4 @@ -From a75ac072023f7ee77d4bd3754f538dd4d6c70aa8 Mon Sep 17 00:00:00 2001 +From afa277f238e97f9dfd54f8f7406b3241299b82a1 Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 25 Oct 2016 11:58:37 -0400 Subject: [PATCH] Add Waterfall configuration files @@ -42,7 +42,7 @@ 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 db2a1b99..3429c989 100644 +index 0bf89f1c..3aae1ea4 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -53,7 +53,7 @@ index db2a1b99..3429c989 100644 import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelException; -@@ -114,7 +115,7 @@ public class BungeeCord extends ProxyServer +@@ -116,7 +117,7 @@ public class BungeeCord extends ProxyServer * Configuration. */ @Getter @@ -63,7 +63,7 @@ index db2a1b99..3429c989 100644 * Localization formats. */ diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java -index 54c3223c..54a6cb38 100644 +index 6967d4fc..1a688179 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java @@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet; @@ -118,5 +118,5 @@ index b9e99d6c..f6b5e8b8 100644 if ( permissions == null ) { -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0005-Disable-Metrics.patch b/BungeeCord-Patches/0005-Disable-Metrics.patch index e7ef3f6dc..7ad15a983 100644 --- a/BungeeCord-Patches/0005-Disable-Metrics.patch +++ b/BungeeCord-Patches/0005-Disable-Metrics.patch @@ -1,4 +1,4 @@ -From 4c9105ed4439711a90b5702e1fc1b4a0d41cffc3 Mon Sep 17 00:00:00 2001 +From 24a912b2aa0bdefad16196f6e93f2f861da8b4f6 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Thu, 19 May 2016 10:55:20 -0700 Subject: [PATCH] Disable Metrics @@ -6,10 +6,10 @@ Subject: [PATCH] Disable Metrics MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;) 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 3429c989..e3eaee39 100644 +index 3aae1ea4..a64d916a 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -125,7 +125,7 @@ public class BungeeCord extends ProxyServer +@@ -127,7 +127,7 @@ public class BungeeCord extends ProxyServer * locations.yml save thread. */ private final Timer saveThread = new Timer( "Reconnect Saver" ); @@ -18,7 +18,7 @@ index 3429c989..e3eaee39 100644 /** * Server socket listener. */ -@@ -312,7 +312,7 @@ public class BungeeCord extends ProxyServer +@@ -315,7 +315,7 @@ public class BungeeCord extends ProxyServer } } }, 0, TimeUnit.MINUTES.toMillis( 5 ) ); @@ -27,7 +27,7 @@ index 3429c989..e3eaee39 100644 Runtime.getRuntime().addShutdownHook( new Thread() { -@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer +@@ -473,7 +473,7 @@ public class BungeeCord extends ProxyServer reconnectHandler.close(); } saveThread.cancel(); @@ -177,5 +177,5 @@ index eabf7573..00000000 - } -} -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch index 5a19c2b3e..344b50716 100644 --- a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch +++ b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch @@ -1,14 +1,14 @@ -From 14cad935db7d6dbae502d46d976de2b9c65c9564 Mon Sep 17 00:00:00 2001 +From 6870d66f4c81c4f0ea6ae7a047e9736998cd652f Mon Sep 17 00:00:00 2001 From: Troy Frew 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 6cb4c798..680af7d3 100644 +index 5be234d0..81def682 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 -@@ -116,6 +116,16 @@ public class ProtocolConstants +@@ -117,6 +117,16 @@ public class ProtocolConstants SUPPORTED_VERSION_IDS = supportedVersionIds.build(); } @@ -26,5 +26,5 @@ index 6cb4c798..680af7d3 100644 { -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch index 918993795..44364a1eb 100644 --- a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch +++ b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch @@ -1,4 +1,4 @@ -From b78e74b5f2a330f2b4544b9d601dc0703cf99aa3 Mon Sep 17 00:00:00 2001 +From 72e674dd91fa98eb9bdca61cd5becd7c689b88ad Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 3 May 2016 20:31:52 -0700 Subject: [PATCH] Don't access a ByteBuf's underlying array @@ -43,10 +43,10 @@ index 70b292f0..91f71c09 100644 * Allow this packet to be sent as an "extended" packet. */ diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index dc6a5a8f..d11f73fc 100644 +index abdbfd1d..04bd6778 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -268,7 +268,7 @@ public class ServerConnector extends PacketHandler +@@ -277,7 +277,7 @@ public class ServerConnector extends PacketHandler ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); @@ -56,7 +56,7 @@ index dc6a5a8f..d11f73fc 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 27737d1b..b7856d92 100644 +index 4684bfd8..63be43eb 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 @@ -69,10 +69,10 @@ index 27737d1b..b7856d92 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 5b9c35d1..2d6885a9 100644 +index 25f045be..544d34ed 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 -@@ -50,7 +50,7 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender; +@@ -55,7 +55,7 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender; public class PipelineUtils { @@ -82,5 +82,5 @@ index 5b9c35d1..2d6885a9 100644 { @Override -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch index a76280c14..60e66dbe2 100644 --- a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch +++ b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch @@ -1,4 +1,4 @@ -From c04feddfe062c0c5fe5b778a677aeb5d94f93cf7 Mon Sep 17 00:00:00 2001 +From a5f76a85a7ab7a4c5ac8a2280bce4a1b93063602 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 14 Mar 2016 15:40:44 -0700 Subject: [PATCH] Optimize uuid conversions @@ -250,10 +250,10 @@ index 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 b1b087aa..b51263a2 100644 +index d9247fb2..43fb3208 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 -@@ -721,7 +721,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -788,7 +788,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String getUUID() { @@ -263,5 +263,5 @@ index b1b087aa..b51263a2 100644 @Override -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch b/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch index 73a9a7343..6a84f2f2a 100644 --- a/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch +++ b/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch @@ -1,4 +1,4 @@ -From 49b2baa3810475443e50eea4cb36919e94b87f3f Mon Sep 17 00:00:00 2001 +From e12f51e0bcdc40a5c8df7d0c55059b78135c4408 Mon Sep 17 00:00:00 2001 From: Daniel Naylor Date: Tue, 25 Oct 2016 12:23:07 -0400 Subject: [PATCH] Add support for FML with IP Forwarding enabled @@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw No breaking changes occur due to this patch. diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index d11f73fc..b684df7d 100644 +index 04bd6778..37f86325 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator; @@ -23,7 +23,7 @@ index d11f73fc..b684df7d 100644 import java.util.Queue; import java.util.Set; import java.util.UUID; -@@ -112,15 +113,39 @@ public class ServerConnector extends PacketHandler +@@ -115,15 +116,39 @@ public class ServerConnector extends PacketHandler String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID(); LoginResult profile = user.getPendingConnection().getLoginProfile(); @@ -67,10 +67,10 @@ index d11f73fc..b684df7d 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 04143a46..12bd18ed 100644 +index 9edec410..c8d5648c 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -170,9 +170,12 @@ public final class UserConnection implements ProxiedPlayer +@@ -173,9 +173,12 @@ public final class UserConnection implements ProxiedPlayer forgeClientHandler = new ForgeClientHandler( this ); @@ -101,5 +101,5 @@ index 6dca2048..f5253b89 100644 * The FML 1.8 handshake token. */ -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch index 3334a9a00..0a868e40a 100644 --- a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch +++ b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch @@ -1,14 +1,14 @@ -From 9cccc52555b08c36eaaf7c5c5c9d16f40ddcffb3 Mon Sep 17 00:00:00 2001 +From 7522a16f8f03479cea4f97e8a265b4bfbca898f2 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 17:36:31 -0600 Subject: [PATCH] Better unit tests for Chat API diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java -index b4595b32..b0698241 100644 +index 7e14484b..3698762c 100644 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java -@@ -675,6 +675,26 @@ public class ComponentsTest +@@ -696,6 +696,26 @@ public class ComponentsTest assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() ); } @@ -36,12 +36,12 @@ index b4595b32..b0698241 100644 public void testLoopSimple() { diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java -index 9ec5dcb1..e56c8353 100644 +index 47c06baa..2552a34f 100644 --- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java +++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java @@ -25,4 +25,12 @@ public class TranslatableComponentTest - assertEquals( "Test string with a placeholder", TextComponent.toPlainText( baseComponents ) ); - assertEquals( "§fTest string with §fa§f placeholder", TextComponent.toLegacyText( baseComponents ) ); + assertEquals( "Test string with a placeholder", BaseComponent.toPlainText( baseComponents ) ); + assertEquals( "§fTest string with §fa§f placeholder", BaseComponent.toLegacyText( baseComponents ) ); } + + @Test @@ -53,5 +53,5 @@ index 9ec5dcb1..e56c8353 100644 + } } -- -2.43.0.windows.1 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch b/BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch index ad22b3b07..3d16c2f00 100644 --- a/BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch +++ b/BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch @@ -1,4 +1,4 @@ -From 3a0cdd8be9488802c79ab27cc6f92ce0b661624a Mon Sep 17 00:00:00 2001 +From 7f826c0f09befc83ba7234c9de5db8823d03ea95 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 28 Jan 2016 15:13:29 -0700 Subject: [PATCH] Allow removing servers or changing addresses on reload @@ -10,7 +10,7 @@ Kicks players on failure to move. Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java -index 54a6cb38..ecd3b619 100644 +index 1a688179..fea0ec61 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java @@ -11,12 +11,15 @@ import java.util.UUID; @@ -29,7 +29,7 @@ index 54a6cb38..ecd3b619 100644 import net.md_5.bungee.util.CaseInsensitiveMap; import net.md_5.bungee.util.CaseInsensitiveSet; -@@ -116,20 +119,38 @@ public abstract class Configuration implements ProxyConfig +@@ -118,20 +121,38 @@ public abstract class Configuration implements ProxyConfig servers = new CaseInsensitiveMap<>( newServers ); } else { @@ -79,5 +79,5 @@ index 54a6cb38..ecd3b619 100644 for ( ListenerInfo listener : listeners ) -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch b/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch index eade1c7e8..c16309816 100644 --- a/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch +++ b/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch @@ -1,4 +1,4 @@ -From 191e3b8b67359f39bac4d62ee57796eb1e793ce3 Mon Sep 17 00:00:00 2001 +From 59119033faf320590e2fd07d16adb79436547856 Mon Sep 17 00:00:00 2001 From: Harry 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 2d6885a9..3f30da0c 100644 +index 544d34ed..6a0d3351 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 -@@ -174,6 +174,7 @@ public class PipelineUtils +@@ -195,6 +195,7 @@ public class PipelineUtils { // IP_TOS is not supported (Windows XP / Windows Server 2003) } @@ -18,5 +18,5 @@ index 2d6885a9..3f30da0c 100644 ch.config().setWriteBufferWaterMark( MARK ); -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch index c64872ffa..16cbfd126 100644 --- a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch +++ b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch @@ -1,4 +1,4 @@ -From 0a9a8b758119babf7b970b147ead38f68ee6775c Mon Sep 17 00:00:00 2001 +From c454b72bd9596c8dbae43ac54da10a045cb14442 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 19 May 2016 17:09:22 -0600 Subject: [PATCH] Allow invalid packet ids for forge servers @@ -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 cc08447c..b55ebede 100644 +index cb5c30d5..a8a91955 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 -@@ -770,14 +770,23 @@ public enum Protocol +@@ -861,14 +861,23 @@ public enum Protocol return protocol; } @@ -66,10 +66,10 @@ index cc08447c..b55ebede 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 b684df7d..4894b3ee 100644 +index 37f86325..1b7395ad 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -225,6 +225,12 @@ public class ServerConnector extends PacketHandler +@@ -234,6 +234,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 b684df7d..4894b3ee 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 9a47f2ec..b768d54a 100644 +index 2bf92a03..ccebe19f 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 -@@ -340,6 +340,12 @@ public abstract class EntityMap +@@ -342,6 +342,12 @@ public abstract class EntityMap int packetId = DefinedPacket.readVarInt( packet ); int packetIdLength = packet.readerIndex() - readerIndex; @@ -100,5 +100,5 @@ index 9a47f2ec..b768d54a 100644 { rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch index 72f983790..905348faa 100644 --- a/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch +++ b/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch @@ -1,4 +1,4 @@ -From fa78d85d4934194d4b6f0b47d30230fee35ce3db Mon Sep 17 00:00:00 2001 +From 7f24b2036591b4b67fcbbeddfdd5829f61a06bff Mon Sep 17 00:00:00 2001 From: Johannes Donath Date: Sat, 4 Jul 2015 06:31:33 +0200 Subject: [PATCH] Add basic support for configurable tab-complete throttling @@ -73,10 +73,10 @@ 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 460aa491..84be12e5 100644 +index f80515d4..050cc29b 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 +@@ -51,6 +51,8 @@ public class UpstreamBridge extends PacketHandler private final ProxyServer bungee; private final UserConnection con; @@ -85,7 +85,7 @@ index 460aa491..84be12e5 100644 public UpstreamBridge(ProxyServer bungee, UserConnection con) { this.bungee = bungee; -@@ -222,6 +224,20 @@ public class UpstreamBridge extends PacketHandler +@@ -230,6 +232,20 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(TabCompleteRequest tabComplete) throws Exception { @@ -107,5 +107,5 @@ index 460aa491..84be12e5 100644 boolean isRegisteredCommand = false; boolean isCommand = tabComplete.getCursor().startsWith( "/" ); -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch index 4f037497d..11592f41c 100644 --- a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From 4cc999421f4825bfa3bc5bfd5c298f6e0990a254 Mon Sep 17 00:00:00 2001 +From 3c900f573943775f96a381294368adf7a977337d Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Sat, 12 Dec 2015 23:43:30 +0100 Subject: [PATCH] Improve server list ping logging @@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this patch remains for a few misc improvements around here diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index 4894b3ee..a8e938be 100644 +index 1b7395ad..e670a57a 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -514,6 +514,6 @@ public class ServerConnector extends PacketHandler +@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler @Override public String toString() { @@ -19,7 +19,7 @@ index 4894b3ee..a8e938be 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 61ce9ed6..976c8e26 100644 +index d408840d..cd3ed518 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 @@ -31,10 +31,10 @@ index 61ce9ed6..976c8e26 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 b51263a2..ea3a9248 100644 +index 43fb3208..4325fe23 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 -@@ -727,20 +727,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -794,20 +794,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String toString() { @@ -57,10 +57,10 @@ index b51263a2..ea3a9248 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 84be12e5..6acbf7bf 100644 +index 050cc29b..740c90ec 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 -@@ -382,6 +382,6 @@ public class UpstreamBridge extends PacketHandler +@@ -396,6 +396,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() { @@ -69,5 +69,5 @@ index 84be12e5..6acbf7bf 100644 } } -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch index 0c8602ea9..c44c40c1c 100644 --- a/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch +++ b/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch @@ -1,4 +1,4 @@ -From 024d2e2f36aa3bd5ba5bbf20c79eaf23f1c38c38 Mon Sep 17 00:00:00 2001 +From 5b5a81ae874f531cc9eab80032218531ef99d75b Mon Sep 17 00:00:00 2001 From: Techcable Date: Sun, 7 Feb 2016 00:01:19 -0700 Subject: [PATCH] Add a property to accept invalid ping packets @@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm Fixes #23 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index ea3a9248..7b02226f 100644 +index 4325fe23..b7dd5fe3 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 -@@ -299,10 +299,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -323,10 +323,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection thisState = State.PING; } @@ -29,5 +29,5 @@ index ea3a9248..7b02226f 100644 disconnect( "" ); } -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch b/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch index 259fcadc6..5cb692466 100644 --- a/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch +++ b/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch @@ -1,4 +1,4 @@ -From 9431bb550c8ad9e18872691d9043dac347bb0ac6 Mon Sep 17 00:00:00 2001 +From 98fe84588782cac3d0d6d8e21865d672d960fdf9 Mon Sep 17 00:00:00 2001 From: kamcio96 Date: Mon, 14 Mar 2016 16:07:20 -0700 Subject: [PATCH] Use a worker and a boss event loop group. @@ -8,10 +8,10 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96 This is proper practice for netty. 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 e3eaee39..89ca9c63 100644 +index a64d916a..3501a4e9 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -120,7 +120,7 @@ public class BungeeCord extends ProxyServer +@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer * Localization formats. */ private Map messageFormats; @@ -20,7 +20,7 @@ index e3eaee39..89ca9c63 100644 /** * locations.yml save thread. */ -@@ -270,7 +270,8 @@ public class BungeeCord extends ProxyServer +@@ -273,7 +273,8 @@ public class BungeeCord extends ProxyServer ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance } @@ -30,7 +30,7 @@ index e3eaee39..89ca9c63 100644 File moduleDirectory = new File( "modules" ); moduleManager.load( this, moduleDirectory ); -@@ -359,7 +360,7 @@ public class BungeeCord extends ProxyServer +@@ -362,7 +363,7 @@ public class BungeeCord extends ProxyServer .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere! .childAttr( PipelineUtils.LISTENER, info ) .childHandler( PipelineUtils.SERVER_CHILD ) @@ -39,7 +39,7 @@ index e3eaee39..89ca9c63 100644 .localAddress( info.getSocketAddress() ) .bind().addListener( listener ); -@@ -382,7 +383,7 @@ public class BungeeCord extends ProxyServer +@@ -385,7 +386,7 @@ public class BungeeCord extends ProxyServer } } }; @@ -48,7 +48,7 @@ index e3eaee39..89ca9c63 100644 } } } -@@ -491,12 +492,14 @@ public class BungeeCord extends ProxyServer +@@ -494,12 +495,14 @@ public class BungeeCord extends ProxyServer } getLogger().info( "Closing IO threads" ); @@ -83,5 +83,5 @@ index 671cf96f..377df7ec 100644 .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() ) .remoteAddress( socketAddress ) -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch index dc1cbf030..747acdee8 100644 --- a/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch +++ b/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch @@ -1,14 +1,14 @@ -From 507a31bafc173948203073eed02cf798677e522e Mon Sep 17 00:00:00 2001 +From ed06b69c09c1694c14f2c189e385359c03d2d5c2 Mon Sep 17 00:00:00 2001 From: Tux 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 6acbf7bf..05e3bd21 100644 +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 -@@ -199,6 +199,7 @@ public class UpstreamBridge extends PacketHandler +@@ -207,6 +207,7 @@ public class UpstreamBridge extends PacketHandler private String handleChat(String message) { @@ -16,7 +16,7 @@ index 6acbf7bf..05e3bd21 100644 for ( int index = 0, length = message.length(); index < length; index++ ) { char c = message.charAt( index ); -@@ -206,8 +207,14 @@ public class UpstreamBridge extends PacketHandler +@@ -214,8 +215,14 @@ public class UpstreamBridge extends PacketHandler { con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) ); throw CancelSendSignal.INSTANCE; @@ -32,5 +32,5 @@ index 6acbf7bf..05e3bd21 100644 ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message ); if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() ) -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch index a9394cf6a..7b6a08c5d 100644 --- a/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch +++ b/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch @@ -1,4 +1,4 @@ -From adfd4ad0550d3830f1bf6baac86ad64f01f228e8 Mon Sep 17 00:00:00 2001 +From 3d660ea51b4d2586735d01c47e0bbbabf037ecc8 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Wed, 29 Jun 2016 04:29:25 +0200 Subject: [PATCH] Add dynamic server addition/removal api. @@ -170,10 +170,10 @@ index 59c104d3..698b420f 100644 private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT ); 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 89ca9c63..b35236f5 100644 +index 3501a4e9..5a3acccf 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -664,10 +664,18 @@ public class BungeeCord extends ProxyServer +@@ -667,10 +667,18 @@ public class BungeeCord extends ProxyServer return config.getServers(); } @@ -194,7 +194,7 @@ index 89ca9c63..b35236f5 100644 @Override diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java -index ecd3b619..7094fe0b 100644 +index fea0ec61..37abb3c4 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java @@ -1,6 +1,7 @@ @@ -221,15 +221,15 @@ index ecd3b619..7094fe0b 100644 /** * Set of all servers. */ -@@ -72,6 +75,7 @@ public abstract class Configuration implements ProxyConfig - private boolean preventProxyConnections; +@@ -73,6 +76,7 @@ public abstract class Configuration implements ProxyConfig private boolean forgeSupport; + private boolean rejectTransfers; + @Synchronized("serversLock") // Waterfall public void load() { ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter(); -@@ -119,7 +123,7 @@ public abstract class Configuration implements ProxyConfig +@@ -121,7 +125,7 @@ public abstract class Configuration implements ProxyConfig servers = new CaseInsensitiveMap<>( newServers ); } else { @@ -238,7 +238,7 @@ index ecd3b619..7094fe0b 100644 for ( ServerInfo oldServer : oldServers.values() ) { -@@ -182,4 +186,71 @@ public abstract class Configuration implements ProxyConfig +@@ -184,4 +188,71 @@ public abstract class Configuration implements ProxyConfig { return favicon; } @@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644 + // Waterfall end } -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch index 4947d7c18..d534a798f 100644 --- a/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch +++ b/BungeeCord-Patches/0025-Improve-ServerKickEvent.patch @@ -1,4 +1,4 @@ -From 3955eb202eed2e2b2b49b8c403b0a72ad40f8f97 Mon Sep 17 00:00:00 2001 +From 9103608fa461755dd6bcb9ef50daeb7465c391af Mon Sep 17 00:00:00 2001 From: Nathan Poirier 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 a8e938be..43af8888 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 -@@ -431,7 +431,7 @@ public class ServerConnector extends PacketHandler +@@ -439,7 +439,7 @@ public class ServerConnector extends PacketHandler ServerKickEvent event = new ServerKickEvent( user, target, new BaseComponent[] { kick.getMessage() @@ -81,7 +81,7 @@ index a8e938be..43af8888 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 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch b/BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch index 380749cd8..80d3226e9 100644 --- a/BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch +++ b/BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch @@ -1,4 +1,4 @@ -From 05603a3876fcfa586dc6b9992b5e428f4a100de6 Mon Sep 17 00:00:00 2001 +From fc3bea4d7af6dc8a70206c274bf09a5de1b1ce73 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Wed, 29 Jun 2016 13:56:57 -0500 Subject: [PATCH] Configurable server version in ping response @@ -66,10 +66,10 @@ index 91743f01..111404fb 100644 public int getTabThrottle() { return tabThrottle; 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 b35236f5..06842eb1 100644 +index 5a3acccf..7e2688ee 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -718,7 +718,7 @@ public class BungeeCord extends ProxyServer +@@ -721,7 +721,7 @@ public class BungeeCord extends ProxyServer @Override public String getGameVersion() { @@ -79,5 +79,5 @@ index b35236f5..06842eb1 100644 @Override -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch index c0edb0451..ef9b97896 100644 --- a/BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch +++ b/BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch @@ -1,4 +1,4 @@ -From f5cc5bc2d7be2deb3fef2eba5c4280ccd50e69f7 Mon Sep 17 00:00:00 2001 +From a864c2093bed9d9405f2d001be01e982361b973d Mon Sep 17 00:00:00 2001 From: Ichbinjoe Date: Sat, 16 Jul 2016 20:44:01 -0400 Subject: [PATCH] Add timeout variant to connect methods @@ -6,10 +6,10 @@ 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 ab879248..4db23b3f 100644 +index 0fe647b8..32af4937 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 +@@ -128,6 +128,38 @@ public interface ProxiedPlayer extends Connection, CommandSender */ void connect(ServerInfo target, Callback callback); @@ -48,7 +48,7 @@ index ab879248..4db23b3f 100644 /** * Connects / transfers this user to the specified connection, gracefully * closing the current one. Depending on the implementation, this method -@@ -139,6 +171,25 @@ public interface ProxiedPlayer extends Connection, CommandSender +@@ -141,6 +173,25 @@ public interface ProxiedPlayer extends Connection, CommandSender */ void connect(ServerInfo target, Callback callback, ServerConnectEvent.Reason reason); @@ -75,10 +75,10 @@ index ab879248..4db23b3f 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 12bd18ed..f7160a66 100644 +index c8d5648c..7e36c0eb 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -282,9 +282,20 @@ public final class UserConnection implements ProxiedPlayer +@@ -285,9 +285,20 @@ public final class UserConnection implements ProxiedPlayer public void connect(ServerInfo info, final Callback callback, final boolean retry, ServerConnectEvent.Reason reason) { @@ -99,7 +99,7 @@ index 12bd18ed..f7160a66 100644 if ( callback != null ) { // Convert the Callback to be compatible with Callback from ServerConnectRequest. -@@ -378,7 +389,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -381,7 +392,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 12bd18ed..f7160a66 100644 { disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) ); -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch index 34c62a30b..6e8d57cc5 100644 --- a/BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch +++ b/BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch @@ -1,18 +1,18 @@ -From 5e0d7a57b4e2576b25facd443f0a41d66c277418 Mon Sep 17 00:00:00 2001 +From d73c441fc5618ddcd75ea95a656dd82af71dd8e7 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Thu, 15 Sep 2016 22:38:37 +0200 Subject: [PATCH] Fix potion race condition on Forge 1.8.9 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java -index 4383dbb5..2b4e4298 100644 +index 7f0b6105..14ad2e71 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java -@@ -243,4 +243,14 @@ public abstract class AbstractPacketHandler - public void handle(FinishConfiguration finishConfiguration) throws Exception +@@ -268,4 +268,14 @@ public abstract class AbstractPacketHandler + public void handle(CookieResponse cookieResponse) throws Exception { } -+ ++ + // Waterfall start + public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception + { @@ -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 f7160a66..a5ddcdc3 100644 +index 7e36c0eb..86223e17 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 @@ @@ -130,7 +130,7 @@ index f7160a66..a5ddcdc3 100644 import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; -@@ -126,6 +128,10 @@ public final class UserConnection implements ProxiedPlayer +@@ -129,6 +131,10 @@ public final class UserConnection implements ProxiedPlayer private final Scoreboard serverSentScoreboard = new Scoreboard(); @Getter private final Collection sentBossBars = new HashSet<>(); @@ -142,7 +142,7 @@ index f7160a66..a5ddcdc3 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 7e416a6d..8a10b057 100644 +index d4036c5d..ad9fc042 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 @@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644 * Sends the server mod list to the client, or stores it for sending later. * -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch index 306e2931f..80c823d9e 100644 --- a/BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch +++ b/BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch @@ -1,4 +1,4 @@ -From 2ec957b0ea78ef67617a5c1c41ea13bf7a138443 Mon Sep 17 00:00:00 2001 +From 83af30c407017a938ffaad29767edad2831e7105 Mon Sep 17 00:00:00 2001 From: Minecrell 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 fc09cc11..7fbac761 100644 +index 15546f07..5182b664 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -49,6 +49,9 @@ @@ -233,7 +233,7 @@ index 00000000..cfd039cd + + diff --git a/pom.xml b/pom.xml -index 3e08cb3c..0c04b87a 100644 +index 58367c45..001f0ae2 100644 --- a/pom.xml +++ b/pom.xml @@ -55,12 +55,13 @@ @@ -253,10 +253,10 @@ index 3e08cb3c..0c04b87a 100644 diff --git a/proxy/pom.xml b/proxy/pom.xml -index 18a5c526..9be9aa22 100644 +index 216e894e..95703fee 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml -@@ -71,7 +71,7 @@ +@@ -83,7 +83,7 @@ io.github.waterfallmc @@ -265,7 +265,7 @@ index 18a5c526..9be9aa22 100644 ${project.version} compile -@@ -93,12 +93,13 @@ +@@ -105,12 +105,13 @@ ${project.version} compile @@ -280,7 +280,7 @@ index 18a5c526..9be9aa22 100644 net.sf.jopt-simple jopt-simple -@@ -130,6 +131,35 @@ +@@ -142,6 +143,35 @@ 1.9.18 runtime @@ -362,7 +362,7 @@ index 00000000..765d24bc + +} 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 06842eb1..d60bdeb0 100644 +index 7e2688ee..066e740d 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -48,7 +48,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -373,7 +373,7 @@ index 06842eb1..d60bdeb0 100644 import lombok.Getter; import lombok.Setter; import lombok.Synchronized; -@@ -81,15 +80,11 @@ import net.md_5.bungee.command.CommandEnd; +@@ -83,15 +82,11 @@ import net.md_5.bungee.command.CommandEnd; import net.md_5.bungee.command.CommandIP; import net.md_5.bungee.command.CommandPerms; import net.md_5.bungee.command.CommandReload; @@ -389,7 +389,7 @@ index 06842eb1..d60bdeb0 100644 import net.md_5.bungee.module.ModuleManager; import net.md_5.bungee.netty.PipelineUtils; import net.md_5.bungee.protocol.DefinedPacket; -@@ -98,8 +93,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage; +@@ -100,8 +95,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage; import net.md_5.bungee.query.RemoteQuery; import net.md_5.bungee.scheduler.BungeeScheduler; import net.md_5.bungee.util.CaseInsensitiveMap; @@ -398,7 +398,7 @@ index 06842eb1..d60bdeb0 100644 /** * Main BungeeCord proxy class. -@@ -159,8 +152,12 @@ public class BungeeCord extends ProxyServer +@@ -161,8 +154,12 @@ public class BungeeCord extends ProxyServer private final File pluginsFolder = new File( "plugins" ); @Getter private final BungeeScheduler scheduler = new BungeeScheduler(); @@ -411,7 +411,7 @@ index 06842eb1..d60bdeb0 100644 @Getter private final Logger logger; public final Gson gson = new GsonBuilder() -@@ -204,6 +201,8 @@ public class BungeeCord extends ProxyServer +@@ -207,6 +204,8 @@ public class BungeeCord extends ProxyServer // BungeeCord. This version is only used when extracting the libraries to their temp folder. System.setProperty( "library.jansi.version", "BungeeCord" ); @@ -420,7 +420,7 @@ index 06842eb1..d60bdeb0 100644 AnsiConsole.systemInstall(); consoleReader = new ConsoleReader(); consoleReader.setExpandEvents( false ); -@@ -228,6 +227,9 @@ public class BungeeCord extends ProxyServer +@@ -231,6 +230,9 @@ public class BungeeCord extends ProxyServer // since it applies a nice looking format and also writes to the logfile. System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) ); System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) ); @@ -430,7 +430,7 @@ index 06842eb1..d60bdeb0 100644 pluginManager = new PluginManager( this ); getPluginManager().registerCommand( null, new CommandReload() ); -@@ -504,10 +506,7 @@ public class BungeeCord extends ProxyServer +@@ -507,10 +509,7 @@ public class BungeeCord extends ProxyServer getLogger().info( "Thank you and goodbye" ); // Need to close loggers after last message! @@ -561,7 +561,7 @@ index 7e465924..00000000 - diff --git a/slf4j/pom.xml b/slf4j/pom.xml deleted file mode 100644 -index b7529bf3..00000000 +index 6d30d554..00000000 --- a/slf4j/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ @@ -579,7 +579,7 @@ index b7529bf3..00000000 - - io.github.waterfallmc - waterfall-slf4j -- 1.20-R0.2-SNAPSHOT +- 1.20-R0.3-SNAPSHOT - jar - - Waterfall-SLF4J @@ -1629,5 +1629,5 @@ index 21a48df6..00000000 - -} -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch index 15b42917c..35626b581 100644 --- a/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch +++ b/BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch @@ -1,4 +1,4 @@ -From 1f305141c3b140348228142d4d450900021a083b Mon Sep 17 00:00:00 2001 +From e9771f21d74b050cbab4e13c3a7bf2172be0318a Mon Sep 17 00:00:00 2001 From: phenomax Date: Thu, 10 Aug 2017 18:41:17 +0200 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent @@ -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 7b02226f..bc98b6b1 100644 +index b7dd5fe3..5fd26bf1 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 -@@ -612,7 +612,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -644,7 +644,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection }; // fire login event @@ -64,5 +64,5 @@ index 7b02226f..bc98b6b1 100644 private void finish2() -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch index afc79eb5c..fc28da834 100644 --- a/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch +++ b/BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch @@ -1,4 +1,4 @@ -From 6bd04a3ed17d267336bf418a14f992d682c648d6 Mon Sep 17 00:00:00 2001 +From af0c08cce0e513f514f9f72ad3d834ecae796acf Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 8 Feb 2018 19:10:52 +0100 Subject: [PATCH] Optionally log InitialHandler connections @@ -61,12 +61,12 @@ 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 bc98b6b1..460a79a1 100644 +index 5fd26bf1..ccc80506 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 -@@ -354,7 +354,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection - break; - case 2: +@@ -380,7 +380,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection + case 3: + transferred = handshake.getRequestedProtocol() == 3; // Login - bungee.getLogger().log( Level.INFO, "{0} has connected", this ); + if (BungeeCord.getInstance().getConfig().isLogInitialHandlerConnections() ) // Waterfall @@ -77,5 +77,5 @@ index bc98b6b1..460a79a1 100644 ch.setProtocol( Protocol.LOGIN ); -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch b/BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch index 877792381..75762c176 100644 --- a/BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch +++ b/BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch @@ -1,14 +1,14 @@ -From ab57199fa438d9abf524c233e569350ec2cfc6e3 Mon Sep 17 00:00:00 2001 +From 83a92fb024f00fe766b177ad48d88010fe203323 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Mon, 28 May 2018 21:43:55 +0100 Subject: [PATCH] Forge is a first class citizen 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 d60bdeb0..0646684f 100644 +index 066e740d..f25ff75a 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -290,8 +290,6 @@ public class BungeeCord extends ProxyServer +@@ -293,8 +293,6 @@ public class BungeeCord extends ProxyServer registerChannel( ForgeConstants.FML_TAG ); registerChannel( ForgeConstants.FML_HANDSHAKE_TAG ); registerChannel( ForgeConstants.FORGE_REGISTER ); @@ -18,18 +18,19 @@ index d60bdeb0..0646684f 100644 isRunning = true; diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java -index 7094fe0b..8911bee8 100644 +index 37abb3c4..a468c5c4 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java -@@ -73,7 +73,7 @@ public abstract class Configuration implements ProxyConfig +@@ -73,8 +73,8 @@ public abstract class Configuration implements ProxyConfig private Favicon favicon; private int compressionThreshold = 256; private boolean preventProxyConnections; - private boolean forgeSupport; + private boolean rejectTransfers; + private boolean forgeSupport = true; // Waterfall: default to enabled @Synchronized("serversLock") // Waterfall public void load() -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch index a1fa3beff..dd1f9f0e6 100644 --- a/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch +++ b/BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch @@ -1,4 +1,4 @@ -From 30f946ce72014dcdcfe31aa7703a5d30b1e13d42 Mon Sep 17 00:00:00 2001 +From 6c6d0092941ba49d117a87cfe38b45203b2b7a05 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 14 Jan 2019 03:35:21 +0000 Subject: [PATCH] Provide an option to disable entity metadata rewriting @@ -57,10 +57,10 @@ index 4ff8da6d..e860214f 100644 + } } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index 43af8888..9a22a1f7 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 -@@ -255,7 +255,8 @@ public class ServerConnector extends PacketHandler +@@ -264,7 +264,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 43af8888..9a22a1f7 100644 { ch.write( user.getSettings() ); } -@@ -310,6 +311,7 @@ public class ServerConnector extends PacketHandler +@@ -319,6 +320,7 @@ public class ServerConnector extends PacketHandler user.getTabListHandler().onServerChange(); Scoreboard serverScoreboard = user.getServerSentScoreboard(); @@ -78,7 +78,7 @@ index 43af8888..9a22a1f7 100644 for ( Objective objective : serverScoreboard.getObjectives() ) { user.unsafe().sendPacket( new ScoreboardObjective( -@@ -333,6 +335,7 @@ public class ServerConnector extends PacketHandler +@@ -342,6 +344,7 @@ public class ServerConnector extends PacketHandler { user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) ); } @@ -86,7 +86,7 @@ index 43af8888..9a22a1f7 100644 serverScoreboard.clear(); for ( UUID bossbar : user.getSentBossBars() ) -@@ -351,13 +354,34 @@ public class ServerConnector extends PacketHandler +@@ -360,13 +363,34 @@ public class ServerConnector extends PacketHandler } user.setDimensionChange( true ); @@ -110,7 +110,7 @@ index 43af8888..9a22a1f7 100644 + } + 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.getPortalCooldown(), login.isSecureProfile() ); + user.unsafe().sendPacket(modLogin); + // Only send if we're in the same dimension + if ( login.getDimension() == user.getDimension() ) // Waterfall - defer @@ -123,14 +123,13 @@ index 43af8888..9a22a1f7 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 a5ddcdc3..1d3b7a9d 100644 +index 86223e17..ee527938 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -791,4 +791,10 @@ public final class UserConnection implements ProxiedPlayer - { - return serverSentScoreboard; +@@ -816,4 +816,9 @@ public final class UserConnection implements ProxiedPlayer + + unsafe().sendPacket( new Transfer( host, port ) ); } -+ + // Waterfall start + public boolean isDisableEntityMetadataRewrite() { + return entityRewrite == net.md_5.bungee.entitymap.EntityMap_Dummy.INSTANCE; @@ -138,7 +137,7 @@ index a5ddcdc3..1d3b7a9d 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 @@ -158,7 +157,7 @@ index 8a10b057..249c3f46 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 b768d54a..e22e956d 100644 +index ccebe19f..cb4f1098 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 @@ -173,7 +172,7 @@ index b768d54a..e22e956d 100644 switch ( version ) { case ProtocolConstants.MINECRAFT_1_8: -@@ -302,7 +307,13 @@ public abstract class EntityMap +@@ -304,7 +309,13 @@ public abstract class EntityMap DefinedPacket.readVarInt( packet ); break; default: @@ -226,5 +225,5 @@ index 00000000..cb81d1dd +// Waterfall end \ No newline at end of file -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch index bbee4dd4f..37a9282b6 100644 --- a/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch +++ b/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch @@ -1,4 +1,4 @@ -From c0d0e8c309f8f6e1419b7b0cc30b7255b902e74a Mon Sep 17 00:00:00 2001 +From 3a229a4d830893b705a69b0241530b052ece4d0f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 25 Nov 2019 19:54:06 +0000 Subject: [PATCH] Speed up some common exceptions @@ -59,10 +59,10 @@ index 6c0ef4df..076ddd70 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 994a5320..cb1eab74 100644 +index 6cd9e6a4..dffd3b7a 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 -@@ -46,6 +46,9 @@ public abstract class DefinedPacket +@@ -47,6 +47,9 @@ public abstract class DefinedPacket } } @@ -72,7 +72,7 @@ index 994a5320..cb1eab74 100644 public static void writeString(String s, ByteBuf buf) { writeString( s, buf, Short.MAX_VALUE ); -@@ -225,13 +228,18 @@ public abstract class DefinedPacket +@@ -242,13 +245,18 @@ public abstract class DefinedPacket byte in; while ( true ) { @@ -172,19 +172,19 @@ 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 460a79a1..b0caf6d6 100644 +index ccc80506..d8d65093 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 -@@ -15,6 +15,8 @@ import java.util.Set; - import java.util.UUID; - import java.util.logging.Level; - import javax.crypto.SecretKey; +@@ -21,6 +21,8 @@ import javax.crypto.SecretKey; + import lombok.AllArgsConstructor; + import lombok.Data; + import lombok.EqualsAndHashCode; +import javax.crypto.spec.SecretKeySpec; + import lombok.Getter; import lombok.RequiredArgsConstructor; - import net.md_5.bungee.BungeeCord; -@@ -470,6 +472,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection + import lombok.ToString; +@@ -502,6 +504,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.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0049-ConnectionInitEvent.patch b/BungeeCord-Patches/0049-ConnectionInitEvent.patch index 2e1a17283..01a668d7c 100644 --- a/BungeeCord-Patches/0049-ConnectionInitEvent.patch +++ b/BungeeCord-Patches/0049-ConnectionInitEvent.patch @@ -1,4 +1,4 @@ -From 25481b9d5076273cd88202d69c10da6ed9767f5a Mon Sep 17 00:00:00 2001 +From a28a34c5110fd34abbc10cafc453d8928b2a2812 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 2 Dec 2019 11:35:17 +0000 Subject: [PATCH] ConnectionInitEvent @@ -67,7 +67,7 @@ index 00000000..6e79675f + } +} 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 3f30da0c..af65e192 100644 +index 6a0d3351..3b157d79 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 @@ -1,6 +1,7 @@ @@ -78,7 +78,7 @@ index 3f30da0c..af65e192 100644 import io.netty.buffer.PooledByteBufAllocator; import io.netty.channel.Channel; import io.netty.channel.ChannelException; -@@ -63,7 +64,6 @@ public class PipelineUtils +@@ -68,7 +69,6 @@ public class PipelineUtils ch.close(); return; } @@ -86,7 +86,7 @@ index 3f30da0c..af65e192 100644 ListenerInfo listener = ch.attr( LISTENER ).get(); if ( BungeeCord.getInstance().getPluginManager().callEvent( new ClientConnectEvent( remoteAddress, listener ) ).isCancelled() ) -@@ -72,7 +72,21 @@ public class PipelineUtils +@@ -77,7 +77,21 @@ public class PipelineUtils return; } @@ -108,7 +108,7 @@ index 3f30da0c..af65e192 100644 ch.pipeline().addBefore( FRAME_DECODER, LEGACY_DECODER, new LegacyDecoder() ); ch.pipeline().addAfter( FRAME_DECODER, PACKET_DECODER, new MinecraftDecoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) ); ch.pipeline().addAfter( FRAME_PREPENDER, PACKET_ENCODER, new MinecraftEncoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) ); -@@ -83,6 +97,9 @@ public class PipelineUtils +@@ -88,6 +102,9 @@ public class PipelineUtils { ch.pipeline().addFirst( new HAProxyMessageDecoder() ); } @@ -119,5 +119,5 @@ index 3f30da0c..af65e192 100644 }; public static final Base BASE = new Base( false ); -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0050-Add-exception-reporting-event.patch b/BungeeCord-Patches/0050-Add-exception-reporting-event.patch index 81499420a..172467655 100644 --- a/BungeeCord-Patches/0050-Add-exception-reporting-event.patch +++ b/BungeeCord-Patches/0050-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 39ff4f7ba8fb95d22fad85120106e2fe7f87f815 Mon Sep 17 00:00:00 2001 +From b806b153af3b9026c2e65b3c74e328986e720953 Mon Sep 17 00:00:00 2001 From: theminecoder Date: Wed, 22 Apr 2020 14:00:44 +1000 Subject: [PATCH] Add exception reporting event @@ -642,7 +642,7 @@ 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 0646684f..7cd0017d 100644 +index f25ff75a..b4e101ac 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,8 @@ import com.google.gson.Gson; @@ -654,7 +654,7 @@ index 0646684f..7cd0017d 100644 import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelException; -@@ -485,7 +487,11 @@ public class BungeeCord extends ProxyServer +@@ -488,7 +490,11 @@ public class BungeeCord extends ProxyServer } } catch ( Throwable t ) { @@ -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.windows.1 diff --git a/BungeeCord-Patches/0053-Add-auth-url-option.patch b/BungeeCord-Patches/0053-Add-auth-url-option.patch index 21222145c..55c9bc287 100644 --- a/BungeeCord-Patches/0053-Add-auth-url-option.patch +++ b/BungeeCord-Patches/0053-Add-auth-url-option.patch @@ -1,14 +1,14 @@ -From c97c6f85ccca1dbf601500ee7b975788d7af7acc Mon Sep 17 00:00:00 2001 +From a04746f37aaa61f06c2189aa7976f37cf1a7d53d Mon Sep 17 00:00:00 2001 From: theminecoder Date: Sun, 19 Jul 2020 10:18:23 +1000 Subject: [PATCH] Add auth url option diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index b0caf6d6..03608ef1 100644 +index d8d65093..ffb078d6 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 -@@ -74,6 +74,8 @@ import net.md_5.bungee.util.QuietException; +@@ -83,6 +83,8 @@ import net.md_5.bungee.util.QuietException; public class InitialHandler extends PacketHandler implements PendingConnection { @@ -17,7 +17,7 @@ index b0caf6d6..03608ef1 100644 private final BungeeCord bungee; private ChannelWrapper ch; @Getter -@@ -498,7 +500,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -530,7 +532,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 b0caf6d6..03608ef1 100644 Callback handler = new Callback() { -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch b/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch index 1b00ff091..2420ed9dd 100644 --- a/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch +++ b/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch @@ -1,4 +1,4 @@ -From d7ec1a5e11b1b0d806f2a0bdcf6a881064081651 Mon Sep 17 00:00:00 2001 +From 3157cb649a524fcf8cfc73da9d3f496dba4abefb Mon Sep 17 00:00:00 2001 From: "Five (Xer)" Date: Sat, 30 Jan 2021 18:04:14 +0100 Subject: [PATCH] Additional DoS mitigations @@ -8,10 +8,10 @@ Courtesy of Tux and the Velocity Contributors. See: https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278 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 8751f271..8c9714fd 100644 +index dffd3b7a..dafaba54 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 -@@ -81,6 +81,7 @@ public abstract class DefinedPacket +@@ -82,6 +82,7 @@ public abstract class DefinedPacket int len = readVarInt( buf ); if ( len > maxLen * 3 ) { @@ -19,7 +19,7 @@ index 8751f271..8c9714fd 100644 throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" ); } -@@ -89,6 +90,7 @@ public abstract class DefinedPacket +@@ -90,6 +91,7 @@ public abstract class DefinedPacket if ( s.length() > maxLen ) { @@ -27,7 +27,7 @@ index 8751f271..8c9714fd 100644 throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" ); } -@@ -550,4 +552,21 @@ public abstract class DefinedPacket +@@ -567,4 +569,21 @@ public abstract class DefinedPacket @Override public abstract String toString(); @@ -257,5 +257,5 @@ index 738f0c92..ec33d337 100644 + // Waterfall end } -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch b/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch index 5313e7ce6..ed082cf01 100644 --- a/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch +++ b/BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch @@ -1,4 +1,4 @@ -From 0e6a3432cad31d9827ed3e35568e93239b951d89 Mon Sep 17 00:00:00 2001 +From cb4306f026fe37b6f2a417026c208e5b8e5bfca5 Mon Sep 17 00:00:00 2001 From: FivePB Date: Tue, 16 Nov 2021 21:15:32 +0100 Subject: [PATCH] Configurable plugin messaging limits @@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 100644 + } } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 03608ef1..97fcd106 100644 +index ffb078d6..bb9063f6 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 -@@ -763,9 +763,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -830,9 +830,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection for ( String id : content.split( "\0" ) ) { @@ -101,5 +101,5 @@ index 03608ef1..97fcd106 100644 } } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) ) -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch b/BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch index 8e9d0399d..914b2bb57 100644 --- a/BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch +++ b/BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch @@ -1,4 +1,4 @@ -From 04ddae3da84541c43f749b212babe1304c24a35f Mon Sep 17 00:00:00 2001 +From 36f7bbd72f65c97e42d32e753a61fc8fdadc1286 Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 1d3b7a9d..6c83039d 100644 +index ee527938..2813c16f 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -295,12 +295,16 @@ public final class UserConnection implements ProxiedPlayer +@@ -298,12 +298,16 @@ public final class UserConnection implements ProxiedPlayer connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout); } @@ -53,7 +53,7 @@ index 1d3b7a9d..6c83039d 100644 builder.connectTimeout(timeout); // Waterfall if ( callback != null ) { -@@ -348,7 +352,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -351,7 +355,7 @@ public final class UserConnection implements ProxiedPlayer callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null ); } @@ -62,7 +62,7 @@ index 1d3b7a9d..6c83039d 100644 return; } if ( pendingConnects.contains( target ) ) -@@ -358,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -361,7 +365,7 @@ public final class UserConnection implements ProxiedPlayer callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null ); } @@ -71,7 +71,7 @@ index 1d3b7a9d..6c83039d 100644 return; } -@@ -394,14 +398,14 @@ public final class UserConnection implements ProxiedPlayer +@@ -397,14 +401,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 1d3b7a9d..6c83039d 100644 } } -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch b/BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch index 19aea7f3e..ef1cfbc23 100644 --- a/BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch +++ b/BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch @@ -1,4 +1,4 @@ -From ad63d355a4d87b0b203c82583e792c53dc82fc88 Mon Sep 17 00:00:00 2001 +From 18f91da38682f9f9a257636e0fbb675ed76659ef Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 6c83039d..553680ee 100644 +index 2813c16f..f29a6f62 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -426,7 +426,8 @@ public final class UserConnection implements ProxiedPlayer +@@ -429,7 +429,8 @@ public final class UserConnection implements ProxiedPlayer private String connectionFailMessage(Throwable cause) { @@ -27,5 +27,5 @@ index 6c83039d..553680ee 100644 @Override -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0060-Improve-login-state-transition.patch b/BungeeCord-Patches/0060-Improve-login-state-transition.patch index ce4fd08ba..28f5a93d6 100644 --- a/BungeeCord-Patches/0060-Improve-login-state-transition.patch +++ b/BungeeCord-Patches/0060-Improve-login-state-transition.patch @@ -1,14 +1,14 @@ -From 9f02acf8b272fc63840c758087213c5d464abcf1 Mon Sep 17 00:00:00 2001 +From 0b563c7cd2441857913c6ac17fe637b8b9fdad6d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 8 May 2022 12:04:30 +0100 Subject: [PATCH] Improve login state transition diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 97fcd106..9c322fb5 100644 +index bb9063f6..f5959b66 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 -@@ -472,6 +472,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -504,6 +504,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 97fcd106..9c322fb5 100644 SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); // Waterfall start -@@ -526,7 +527,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -558,7 +559,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection } } }; @@ -26,5 +26,5 @@ index 97fcd106..9c322fb5 100644 } -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0061-Add-protocol-version-to-packet-not-found-message.patch b/BungeeCord-Patches/0061-Add-protocol-version-to-packet-not-found-message.patch index 196e737eb..0d345ac06 100644 --- a/BungeeCord-Patches/0061-Add-protocol-version-to-packet-not-found-message.patch +++ b/BungeeCord-Patches/0061-Add-protocol-version-to-packet-not-found-message.patch @@ -1,4 +1,4 @@ -From b53958447d57fd8bf97defa9550a0bd5577b086f Mon Sep 17 00:00:00 2001 +From 17e3c7512e36d9334f871131a650de6912ab97ae Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 b55ebede..27d4c2c4 100644 +index a8a91955..414d4578 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 b55ebede..27d4c2c4 100644 import gnu.trove.map.TIntObjectMap; import gnu.trove.map.TObjectIntMap; import gnu.trove.map.hash.TIntObjectHashMap; -@@ -851,9 +853,12 @@ public enum Protocol +@@ -942,9 +944,12 @@ public enum Protocol { throw new BadPacketException( "Unsupported protocol version" ); } @@ -34,5 +34,5 @@ index b55ebede..27d4c2c4 100644 } } -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch b/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch index 8418202d3..514463a03 100644 --- a/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch +++ b/BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch @@ -1,4 +1,4 @@ -From 17682183ba6a38abcf489250d5a1806a6b9c835d Mon Sep 17 00:00:00 2001 +From ec689ad0db57ea99558f37756235c3a211d8791d Mon Sep 17 00:00:00 2001 From: Aurora Date: Mon, 18 Jul 2022 15:56:05 +0200 Subject: [PATCH] Add message for outdated clients that don't support secure @@ -8,10 +8,10 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is things checked those outdated clients didn't get a useful message telling them to update. diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 9c322fb5..a9358a51 100644 +index f5959b66..72d48c72 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 -@@ -395,6 +395,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -427,6 +427,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 ) { @@ -20,7 +20,7 @@ index 9c322fb5..a9358a51 100644 if ( publicKey == null ) { diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties -index e42b798b..76ad621f 100644 +index 149c742f..8d5075f6 100644 --- a/proxy/src/main/resources/messages.properties +++ b/proxy/src/main/resources/messages.properties @@ -25,6 +25,7 @@ offline_mode_player=\u00a7cNot authenticated with Minecraft.net @@ -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.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch b/BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch index 4dda20a12..7bf69c81b 100644 --- a/BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch +++ b/BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch @@ -1,4 +1,4 @@ -From 7a1be158a495b23c3d4e77f29dfb72daca03aa10 Mon Sep 17 00:00:00 2001 +From 9df76c8fb3ad1e0ac0131244da7b91023cfe77da Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Mon, 21 Jun 2021 23:43:39 +0200 Subject: [PATCH] Replace reflection inside netty with ChannelFactory. @@ -6,10 +6,10 @@ 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 7cd0017d..01c8a172 100644 +index b4e101ac..9b93d2c3 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 +@@ -361,7 +361,7 @@ public class BungeeCord extends ProxyServer } }; new ServerBootstrap() @@ -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 553680ee..2f996a69 100644 +index f29a6f62..1d009633 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -411,7 +411,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -414,7 +414,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 af65e192..6a045d16 100644 +index 3b157d79..0cb8f910 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,10 +80,10 @@ index af65e192..6a045d16 100644 import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; import io.netty.channel.EventLoopGroup; -@@ -119,6 +120,12 @@ public class PipelineUtils - public static final String LEGACY_KICKER = "legacy-kick"; +@@ -125,6 +126,12 @@ public class PipelineUtils private static boolean epoll; + private static boolean io_uring; + // Waterfall start: netty reflection -> factory + private static final ChannelFactory serverChannelFactory; + private static final ChannelFactory serverChannelDomainFactory; @@ -93,8 +93,8 @@ index af65e192..6a045d16 100644 static { -@@ -134,6 +141,12 @@ public class PipelineUtils - ProxyServer.getInstance().getLogger().log( Level.WARNING, "Epoll is not working, falling back to NIO: {0}", Util.exception( Epoll.unavailabilityCause() ) ); +@@ -155,6 +162,12 @@ public class PipelineUtils + } } } + // Waterfall start: netty reflection -> factory @@ -106,8 +106,8 @@ index af65e192..6a045d16 100644 } public static EventLoopGroup newEventLoopGroup(int threads, ThreadFactory factory) -@@ -165,6 +178,34 @@ public class PipelineUtils - return epoll ? EpollSocketChannel.class : NioSocketChannel.class; +@@ -186,6 +199,34 @@ public class PipelineUtils + return io_uring ? IOUringSocketChannel.class : epoll ? EpollSocketChannel.class : NioSocketChannel.class; } + // Waterfall start: netty reflection -> factory @@ -140,7 +140,7 @@ index af65e192..6a045d16 100644 + public static Class getDatagramChannel() { - return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class; + return io_uring ? IOUringDatagramChannel.class : epoll ? EpollDatagramChannel.class : NioDatagramChannel.class; -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch b/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch index 1062b23ec..f44199a91 100644 --- a/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch +++ b/BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch @@ -1,14 +1,14 @@ -From d3343b033840d723bfc103fca04c04cb2975c412 Mon Sep 17 00:00:00 2001 +From 544055d0e6a874f1cb9fbee6731168cb8800a851 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 21 Apr 2023 15:32:33 +0100 Subject: [PATCH] reduce log spam from clients registeirng too many channels diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index a9358a51..5e74d0e2 100644 +index 72d48c72..0b5bee55 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 -@@ -162,7 +162,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -186,7 +186,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public void handle(PluginMessage pluginMessage) throws Exception { @@ -28,5 +28,5 @@ index a9358a51..5e74d0e2 100644 @Override -- -2.43.0 +2.44.0.windows.1 diff --git a/BungeeCord-Patches/0066-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch b/BungeeCord-Patches/0066-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch index 303828d41..37742e48c 100644 --- a/BungeeCord-Patches/0066-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch +++ b/BungeeCord-Patches/0066-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch @@ -1,14 +1,14 @@ -From 674e934b2caa424135b34c4b246962f8767a4009 Mon Sep 17 00:00:00 2001 +From 257e484cae6938465d9c727a29d790b822837e94 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Oct 2023 00:36:38 +0100 Subject: [PATCH] Prevent proxy commands from breaking the chat chain system diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java -index 2b4e4298..1fad0818 100644 +index 14ad2e71..fe6c7339 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java -@@ -252,5 +252,9 @@ public abstract class AbstractPacketHandler +@@ -277,5 +277,9 @@ public abstract class AbstractPacketHandler public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception { } @@ -19,12 +19,12 @@ index 2b4e4298..1fad0818 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 27d4c2c4..bd66e7a5 100644 +index 414d4578..3a69fced 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 -@@ -496,6 +496,13 @@ public enum Protocol - map( ProtocolConstants.MINECRAFT_1_19, 0x04 ), - map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 ) +@@ -545,6 +545,13 @@ public enum Protocol + map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 ), + map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 ) ); + // Waterfall start + TO_SERVER.registerPacket( @@ -76,10 +76,10 @@ 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 fb53ba74..f8e2db8d 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 +@@ -118,4 +118,9 @@ public class ClientCommand extends DefinedPacket { handler.handle( this ); } @@ -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 05e3bd21..dff5e283 100644 +index 3084e7e7..2cc0191a 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 -@@ -194,10 +194,15 @@ public class UpstreamBridge extends PacketHandler +@@ -196,7 +196,7 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(ClientCommand command) throws Exception { @@ -101,6 +101,11 @@ index 05e3bd21..dff5e283 100644 + handleChat( "/" + command.getCommand(), command ); // Waterfall } + @Override +@@ -205,7 +205,12 @@ public class UpstreamBridge extends PacketHandler + handleChat( "/" + command.getCommand() ); + } + - private String handleChat(String message) + // Waterfall start + private String handleChat(String message) { @@ -111,7 +116,7 @@ index 05e3bd21..dff5e283 100644 { boolean empty = true; for ( int index = 0, length = message.length(); index < length; index++ ) -@@ -223,6 +228,12 @@ public class UpstreamBridge extends PacketHandler +@@ -231,6 +236,12 @@ public class UpstreamBridge extends PacketHandler if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) ) { return message; @@ -125,5 +130,5 @@ index 05e3bd21..dff5e283 100644 } throw CancelSendSignal.INSTANCE; -- -2.43.0 +2.44.0.windows.1