From 958ae29cab8832d1093f4fa9292b345cd12d9a4b Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Tue, 7 Jun 2022 19:12:20 +0200 Subject: [PATCH] Updated Upstream (BungeeCord) (#741) --- BungeeCord | 2 +- BungeeCord-Patches/0001-POM-Changes.patch | 117 ++++++++---------- .../0002-Copy-license-files-into-jar.patch | 25 ++-- .../0007-Fixup-ProtocolConstants.patch | 8 +- .../0010-Optimize-uuid-conversions.patch | 10 +- ...t-for-FML-with-IP-Forwarding-enabled.patch | 18 +-- ...ervers-or-changing-addresses-on-relo.patch | 8 +- ...invalid-packet-ids-for-forge-servers.patch | 18 +-- ...t-for-configurable-tab-complete-thro.patch | 10 +- ...019-Improve-server-list-ping-logging.patch | 14 +-- ...perty-to-accept-invalid-ping-packets.patch | 8 +- ...ate-that-chat-messages-are-non-blank.patch | 20 +-- ...-dynamic-server-addition-removal-api.patch | 12 +- ...d-timeout-variant-to-connect-methods.patch | 10 +- ...potion-race-condition-on-Forge-1.8.9.patch | 26 ++-- ...ogging-and-TerminalConsoleAppender-f.patch | 32 ++--- ...-to-the-player-s-LoginResult-on-Logi.patch | 8 +- ...nally-log-InitialHandler-connections.patch | 8 +- .../0042-Forge-is-a-first-class-citizen.patch | 10 +- ...n-to-disable-entity-metadata-rewriti.patch | 38 +++--- ...0050-Speed-up-some-common-exceptions.patch | 16 +-- .../0055-Add-auth-url-option.patch | 10 +- .../0057-Additional-DoS-mitigations.patch | 28 ++--- ...Configurable-plugin-messaging-limits.patch | 8 +- ...62-ServerConnectRequest-sendFeedback.patch | 14 +-- ...tions-to-the-client-during-kicks-etc.patch | 8 +- .../0064-Improve-login-state-transition.patch | 12 +- 27 files changed, 240 insertions(+), 258 deletions(-) diff --git a/BungeeCord b/BungeeCord index 862bb2a..eccdf87 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 862bb2ac72fbabafb40935f9b7eb44a6faea061a +Subproject commit eccdf87f2217ae3a0f6943134d8c61df3f9d0097 diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch index c3f62c1..9ac4b5a 100644 --- a/BungeeCord-Patches/0001-POM-Changes.patch +++ b/BungeeCord-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 247a5fa8aa2977fa0ce1e19e7bb59705cfddd1b7 Mon Sep 17 00:00:00 2001 +From 51eef67f33ed5ea9b51cef40c7b6a0065950ef5b 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 79cab35b..4c87a36e 100644 +index 22735ae6..2004c741 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,42 +4,42 @@ @@ -18,7 +18,7 @@ index 79cab35b..4c87a36e 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -26,7 +26,7 @@ index 79cab35b..4c87a36e 100644 - bungeecord-api + io.github.waterfallmc + waterfall-api - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-API @@ -67,7 +67,7 @@ index 79cab35b..4c87a36e 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index c7eabe73..b3a70840 100644 +index 6e5c197d..cf7ef042 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,39 +4,40 @@ @@ -78,7 +78,7 @@ index c7eabe73..b3a70840 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -86,7 +86,7 @@ index c7eabe73..b3a70840 100644 - bungeecord-bootstrap + io.github.waterfallmc + waterfall-bootstrap - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Bootstrap @@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644 return; } diff --git a/chat/pom.xml b/chat/pom.xml -index 0c244852..0ad5dd16 100644 +index a8a94a9c..3ac27114 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,19 +4,19 @@ @@ -156,7 +156,7 @@ index 0c244852..0ad5dd16 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -164,7 +164,7 @@ index 0c244852..0ad5dd16 100644 - bungeecord-chat + io.github.waterfallmc + waterfall-chat - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Chat @@ -175,7 +175,7 @@ index 0c244852..0ad5dd16 100644 diff --git a/config/pom.xml b/config/pom.xml -index 87208ac2..7d32ea69 100644 +index 6557b88d..ac721ee3 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,19 +4,19 @@ @@ -186,7 +186,7 @@ index 87208ac2..7d32ea69 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -194,7 +194,7 @@ index 87208ac2..7d32ea69 100644 - bungeecord-config + io.github.waterfallmc + waterfall-config - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Config @@ -205,7 +205,7 @@ index 87208ac2..7d32ea69 100644 diff --git a/event/pom.xml b/event/pom.xml -index 37320a3b..e2432463 100644 +index 46c38144..ac85fc82 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -4,17 +4,17 @@ @@ -216,7 +216,7 @@ index 37320a3b..e2432463 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -224,7 +224,7 @@ index 37320a3b..e2432463 100644 - bungeecord-event + io.github.waterfallmc + waterfall-event - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Event @@ -233,7 +233,7 @@ index 37320a3b..e2432463 100644 + Generic java event dispatching API intended for use with Waterfall. diff --git a/log/pom.xml b/log/pom.xml -index 28545b92..465ebbf2 100644 +index 8bba9f62..d61dba6f 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -4,19 +4,19 @@ @@ -244,7 +244,7 @@ index 28545b92..465ebbf2 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -252,7 +252,7 @@ index 28545b92..465ebbf2 100644 - bungeecord-log + io.github.waterfallmc + waterfall-log - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Log @@ -274,7 +274,7 @@ index 28545b92..465ebbf2 100644 compile diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml -index dcf93888..b41791f1 100644 +index 88b4aa99..64d197ce 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -4,14 +4,14 @@ @@ -285,7 +285,7 @@ index dcf93888..b41791f1 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -293,11 +293,11 @@ index dcf93888..b41791f1 100644 - bungeecord-module-cmd-alert + io.github.waterfallmc + waterfall-module-cmd-alert - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml -index 59163873..a17080ab 100644 +index cb15b266..c4ad20de 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -4,14 +4,14 @@ @@ -308,7 +308,7 @@ index 59163873..a17080ab 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -316,11 +316,11 @@ index 59163873..a17080ab 100644 - bungeecord-module-cmd-find + io.github.waterfallmc + waterfall-module-cmd-find - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml -index 23f69747..16003086 100644 +index 81a660bf..9e22202d 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -4,14 +4,14 @@ @@ -331,7 +331,7 @@ index 23f69747..16003086 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -339,11 +339,11 @@ index 23f69747..16003086 100644 - bungeecord-module-cmd-list + io.github.waterfallmc + waterfall-module-cmd-list - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml -index db9e4762..ba084281 100644 +index 574b6af3..5326f925 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -4,14 +4,14 @@ @@ -354,7 +354,7 @@ index db9e4762..ba084281 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -362,11 +362,11 @@ index db9e4762..ba084281 100644 - bungeecord-module-cmd-send + io.github.waterfallmc + waterfall-module-cmd-send - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml -index 06f55aa8..cb4d2932 100644 +index f9de38c4..86faab24 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -4,14 +4,14 @@ @@ -377,7 +377,7 @@ index 06f55aa8..cb4d2932 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -385,11 +385,11 @@ index 06f55aa8..cb4d2932 100644 - bungeecord-module-cmd-server + io.github.waterfallmc + waterfall-module-cmd-server - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar diff --git a/module/pom.xml b/module/pom.xml -index 32d966a0..350a49b8 100644 +index cbc26049..b4283e43 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -4,19 +4,19 @@ @@ -400,7 +400,7 @@ index 32d966a0..350a49b8 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -408,7 +408,7 @@ index 32d966a0..350a49b8 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT pom - BungeeCord Modules @@ -438,7 +438,7 @@ index 32d966a0..350a49b8 100644 compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml -index 4bb408fe..d3476fc5 100644 +index 4f3332dd..8aff53bd 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -4,8 +4,8 @@ @@ -449,11 +449,11 @@ index 4bb408fe..d3476fc5 100644 - bungeecord-module + io.github.waterfallmc + waterfall-module - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml diff --git a/native/pom.xml b/native/pom.xml -index aa62ce2a..1eff2c93 100644 +index f7773d80..caa4c4cb 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -4,19 +4,19 @@ @@ -464,7 +464,7 @@ index aa62ce2a..1eff2c93 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -472,7 +472,7 @@ index aa62ce2a..1eff2c93 100644 - bungeecord-native + io.github.waterfallmc + waterfall-native - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Native @@ -483,7 +483,7 @@ index aa62ce2a..1eff2c93 100644 diff --git a/pom.xml b/pom.xml -index 1b1e8e9d..f371e3dd 100644 +index 27f16b27..fad424b6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,25 @@ @@ -501,7 +501,7 @@ index 1b1e8e9d..f371e3dd 100644 + + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT pom - BungeeCord-Parent @@ -708,7 +708,7 @@ index 1b1e8e9d..f371e3dd 100644 diff --git a/protocol/pom.xml b/protocol/pom.xml -index e7a492f6..a783d9b0 100644 +index de6bd2e0..93ae5952 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -4,19 +4,19 @@ @@ -719,7 +719,7 @@ index e7a492f6..a783d9b0 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -727,7 +727,7 @@ index e7a492f6..a783d9b0 100644 - bungeecord-protocol + io.github.waterfallmc + waterfall-protocol - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Protocol @@ -749,7 +749,7 @@ index e7a492f6..a783d9b0 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index b49b4c5c..9d5d939b 100644 +index af8f76b2..a86eb68c 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ @@ -760,7 +760,7 @@ index b49b4c5c..9d5d939b 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -768,7 +768,7 @@ index b49b4c5c..9d5d939b 100644 - bungeecord-proxy + io.github.waterfallmc + waterfall-proxy - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Proxy @@ -819,17 +819,8 @@ index b49b4c5c..9d5d939b 100644 ${project.version} compile -@@ -94,7 +94,7 @@ - - mysql - mysql-connector-java -- 8.0.27 -+ 8.0.29 - runtime - - diff --git a/query/pom.xml b/query/pom.xml -index 9e0c4539..081bff62 100644 +index 5ea69b24..72eb14e2 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -4,19 +4,19 @@ @@ -840,7 +831,7 @@ index 9e0c4539..081bff62 100644 - bungeecord-parent + io.github.waterfallmc + waterfall-parent - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT ../pom.xml @@ -848,7 +839,7 @@ index 9e0c4539..081bff62 100644 - bungeecord-query + io.github.waterfallmc + waterfall-query - 1.18-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT jar - BungeeCord-Query @@ -870,5 +861,5 @@ index 9e0c4539..081bff62 100644 compile -- -2.36.0 +2.35.3 diff --git a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch index e35289c..e9a0be8 100644 --- a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch +++ b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch @@ -1,18 +1,21 @@ -From 1eafcaf9e03e0a2280b2f86b51e1eb00b08d4c5e Mon Sep 17 00:00:00 2001 +From 642384e902e7533cb16d113de3ae970be011532f 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 d1700424..f5610a53 100644 +index a86eb68c..82366109 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml -@@ -124,6 +124,20 @@ - src/main/resources - true - -+ +@@ -117,4 +117,23 @@ + runtime + + ++ ++ ++ ++ + + ../ + @@ -25,10 +28,10 @@ index d1700424..f5610a53 100644 + LICENSE.txt + + -+ - - ++ ++ ++ -- -2.31.0 +2.35.3 diff --git a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch index 9b6a597..a23db28 100644 --- a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch +++ b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch @@ -1,14 +1,14 @@ -From dbfa2c6ed3e8d0843dd28523c5ee02f071f9b9fc Mon Sep 17 00:00:00 2001 +From 59757b0ed87cefeba419ab0aa1d8af45a30da6a9 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 7da127fb..6360818c 100644 +index 180a5759..164b544e 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 -@@ -100,6 +100,16 @@ public class ProtocolConstants +@@ -103,6 +103,16 @@ public class ProtocolConstants SUPPORTED_VERSION_IDS = supportedVersionIds.build(); } @@ -26,5 +26,5 @@ index 7da127fb..6360818c 100644 { -- -2.35.1 +2.35.3 diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch index 2c59712..fd7e23a 100644 --- a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch +++ b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch @@ -1,4 +1,4 @@ -From 852b9a521e5d663cf4c687b6d80fa320bad97f90 Mon Sep 17 00:00:00 2001 +From 61b1a00d4692ae14d22c3afa416782d1a4ccb9e1 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 14 Mar 2016 15:40:44 -0700 Subject: [PATCH] Optimize uuid conversions @@ -207,7 +207,7 @@ index 00000000..cc24dd35 +} \ No newline at end of file diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java -index e565c836..7b79346c 100644 +index 1457d4c8..70bf87f7 100644 --- a/api/src/main/java/net/md_5/bungee/Util.java +++ b/api/src/main/java/net/md_5/bungee/Util.java @@ -3,6 +3,7 @@ package net.md_5.bungee; @@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 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 89f2d9fe..c254379a 100644 +index 62408738..8fedbe2f 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 -@@ -640,7 +640,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -666,7 +666,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String getUUID() { @@ -263,5 +263,5 @@ index 89f2d9fe..c254379a 100644 @Override -- -2.34.0 +2.35.3 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 73ef1d6..7ee1edd 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 79e294bbcc469302c659cb0fd5545854d5c4d1e7 Mon Sep 17 00:00:00 2001 +From 51fe7e01d834ef8c6f41f6cd3ebb2adec745ffe4 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 5c74d5f1..d1715b9c 100644 +index 28205be3..b71a2c35 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; @@ -29,7 +29,7 @@ index 5c74d5f1..d1715b9c 100644 LoginResult profile = user.getPendingConnection().getLoginProfile(); + + // Handle properties. -+ LoginResult.Property[] properties = new LoginResult.Property[0]; ++ net.md_5.bungee.protocol.Property[] properties = new net.md_5.bungee.protocol.Property[0]; + if ( profile != null && profile.getProperties() != null && profile.getProperties().length > 0 ) { @@ -40,13 +40,13 @@ index 5c74d5f1..d1715b9c 100644 + if ( user.getForgeClientHandler().isFmlTokenInHandshake() ) + { + // Get the current properties and copy them into a slightly bigger array. -+ LoginResult.Property[] newp = Arrays.copyOf( properties, properties.length + 2 ); ++ net.md_5.bungee.protocol.Property[] newp = Arrays.copyOf( properties, properties.length + 2 ); + + // Add a new profile property that specifies that this user is a Forge user. -+ newp[newp.length - 2] = new LoginResult.Property( ForgeConstants.FML_LOGIN_PROFILE, "true", null ); ++ newp[newp.length - 2] = new net.md_5.bungee.protocol.Property( ForgeConstants.FML_LOGIN_PROFILE, "true", null ); + + // If we do not perform the replacement, then the IP Forwarding code in Spigot et. al. will try to split on this prematurely. -+ newp[newp.length - 1] = new LoginResult.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" ); ++ newp[newp.length - 1] = new net.md_5.bungee.protocol.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" ); + + // All done. + properties = newp; @@ -67,10 +67,10 @@ index 5c74d5f1..d1715b9c 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 e481d6df..04a3a73c 100644 +index e1b084ea..f0fb7694 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -163,8 +163,12 @@ public final class UserConnection implements ProxiedPlayer +@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer forgeClientHandler = new ForgeClientHandler( this ); @@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644 * The FML 1.8 handshake token. */ -- -2.35.1 +2.35.3 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 6226c70..5e6a28a 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 f4a19cd3877f948c0dabd916d161fc89eb88b706 Mon Sep 17 00:00:00 2001 +From a761cca9133852a90022b32fa030a8c54da035a7 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 56a0f29c..d640313a 100644 +index 54a6cb38..ecd3b619 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 56a0f29c..d640313a 100644 import net.md_5.bungee.util.CaseInsensitiveMap; import net.md_5.bungee.util.CaseInsensitiveSet; -@@ -111,20 +114,38 @@ public abstract class Configuration implements ProxyConfig +@@ -116,20 +119,38 @@ public abstract class Configuration implements ProxyConfig servers = new CaseInsensitiveMap<>( newServers ); } else { @@ -79,5 +79,5 @@ index 56a0f29c..d640313a 100644 for ( ListenerInfo listener : listeners ) -- -2.30.1 (Apple Git-130) +2.35.3 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 dc0e804..f883001 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 b0b475097ab0749bce066f1d1d967318f42de5f7 Mon Sep 17 00:00:00 2001 +From 65e8e0bc2366c20b70bb861adc67b50c7fc17057 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 773e954c..57bd22b7 100644 { packet.read( in, 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 21f4a5d5..220365dd 100644 +index 38394808..c4434b24 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 -@@ -522,14 +522,23 @@ public enum Protocol +@@ -564,14 +564,23 @@ public enum Protocol return protocol; } @@ -66,7 +66,7 @@ index 21f4a5d5..220365dd 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 d1715b9c..0825a5a1 100644 +index b71a2c35..0c036650 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -34,7 +34,9 @@ import net.md_5.bungee.forge.ForgeUtils; @@ -93,10 +93,10 @@ index d1715b9c..0825a5a1 100644 ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) ); 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 04a3a73c..ef6b3ed6 100644 +index f0fb7694..8268e30b 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -73,6 +73,7 @@ public final class UserConnection implements ProxiedPlayer @NonNull private final ProxyServer bungee; @NonNull @@ -105,10 +105,10 @@ index 04a3a73c..ef6b3ed6 100644 @Getter @NonNull 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 75164c67..f87ce538 100644 +index 81a1cfc3..45c2bea6 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 -@@ -328,6 +328,12 @@ public abstract class EntityMap +@@ -330,6 +330,12 @@ public abstract class EntityMap int packetId = DefinedPacket.readVarInt( packet ); int packetIdLength = packet.readerIndex() - readerIndex; @@ -122,5 +122,5 @@ index 75164c67..f87ce538 100644 { rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); -- -2.32.0 (Apple Git-132) +2.35.3 diff --git a/BungeeCord-Patches/0018-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0018-Add-basic-support-for-configurable-tab-complete-thro.patch index ab1d66c..b278489 100644 --- a/BungeeCord-Patches/0018-Add-basic-support-for-configurable-tab-complete-thro.patch +++ b/BungeeCord-Patches/0018-Add-basic-support-for-configurable-tab-complete-thro.patch @@ -1,4 +1,4 @@ -From 441be0a40b0298e8e5f2c66a337d365f9ec1c065 Mon Sep 17 00:00:00 2001 +From 57168eee47c7b9ad899fdb85640c9022dbbead09 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 253c3287..079ae5a0 100644 +index bb3faf5d..e6d5da03 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 -@@ -40,6 +40,8 @@ public class UpstreamBridge extends PacketHandler +@@ -42,6 +42,8 @@ public class UpstreamBridge extends PacketHandler private final ProxyServer bungee; private final UserConnection con; @@ -85,7 +85,7 @@ index 253c3287..079ae5a0 100644 public UpstreamBridge(ProxyServer bungee, UserConnection con) { this.bungee = bungee; -@@ -170,6 +172,20 @@ public class UpstreamBridge extends PacketHandler +@@ -196,6 +198,20 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(TabCompleteRequest tabComplete) throws Exception { @@ -107,5 +107,5 @@ index 253c3287..079ae5a0 100644 boolean isRegisteredCommand = false; -- -2.30.1 (Apple Git-130) +2.35.3 diff --git a/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch index 3453ad7..68021da 100644 --- a/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From 23c97f066c6eb8f118df992be1e785a25bf33011 Mon Sep 17 00:00:00 2001 +From d2d96de49624a5acba2706ed3e3f82b35c28a488 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,7 +7,7 @@ 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 0825a5a1..175150c7 100644 +index 0c036650..6b7aee66 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -460,6 +460,6 @@ public class ServerConnector extends PacketHandler @@ -31,10 +31,10 @@ index a047c8b7..f8691bc4 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 c254379a..465fb3c1 100644 +index 8fedbe2f..92b4044a 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 -@@ -646,20 +646,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -672,20 +672,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String toString() { @@ -57,10 +57,10 @@ index c254379a..465fb3c1 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 5b58fdea..af19796f 100644 +index e6d5da03..58736e6f 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 -@@ -287,6 +287,6 @@ public class UpstreamBridge extends PacketHandler +@@ -313,6 +313,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() { @@ -69,5 +69,5 @@ index 5b58fdea..af19796f 100644 } } -- -2.35.1 +2.35.3 diff --git a/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch index 7392ffd..87e7a38 100644 --- a/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch +++ b/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch @@ -1,4 +1,4 @@ -From 46b9593c1f86d88fee2dbf10646a0ba823131b08 Mon Sep 17 00:00:00 2001 +From f4aedd7b64a5bea3be53b9851f99dc99cdf76016 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 465fb3c1..61e8e9a7 100644 +index 92b4044a..bb227151 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 -@@ -277,10 +277,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -279,10 +279,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection thisState = State.PING; } @@ -29,5 +29,5 @@ index 465fb3c1..61e8e9a7 100644 disconnect( "" ); } -- -2.33.0 +2.35.3 diff --git a/BungeeCord-Patches/0023-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0023-Validate-that-chat-messages-are-non-blank.patch index fc3b479..6765fec 100644 --- a/BungeeCord-Patches/0023-Validate-that-chat-messages-are-non-blank.patch +++ b/BungeeCord-Patches/0023-Validate-that-chat-messages-are-non-blank.patch @@ -1,22 +1,22 @@ -From eb08195f059ee1135c1eee1bc86089a83b6d2f95 Mon Sep 17 00:00:00 2001 +From ef16549d09c6a26772a904c40709b6a5edfd020c 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 30623743..c769976f 100644 +index 58736e6f..b9a4b03c 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 -@@ -147,6 +147,7 @@ public class UpstreamBridge extends PacketHandler - @Override - public void handle(Chat chat) throws Exception +@@ -173,6 +173,7 @@ public class UpstreamBridge extends PacketHandler + + private String handleChat(String message) { + boolean empty = true; - for ( int index = 0, length = chat.getMessage().length(); index < length; index++ ) + for ( int index = 0, length = message.length(); index < length; index++ ) { - char c = chat.getMessage().charAt( index ); -@@ -154,8 +155,11 @@ public class UpstreamBridge extends PacketHandler + char c = message.charAt( index ); +@@ -180,8 +181,11 @@ public class UpstreamBridge extends PacketHandler { con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) ); throw CancelSendSignal.INSTANCE; @@ -26,8 +26,8 @@ index 30623743..c769976f 100644 } + Preconditions.checkArgument(!empty, "Chat message is empty"); - ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() ); + ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message ); if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() ) -- -2.30.1 (Apple Git-130) +2.35.3 diff --git a/BungeeCord-Patches/0024-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0024-Add-dynamic-server-addition-removal-api.patch index 1cd83a6..224018f 100644 --- a/BungeeCord-Patches/0024-Add-dynamic-server-addition-removal-api.patch +++ b/BungeeCord-Patches/0024-Add-dynamic-server-addition-removal-api.patch @@ -1,4 +1,4 @@ -From 2f052d8ead2ce37041ede5dd409cf66a940d1a8e Mon Sep 17 00:00:00 2001 +From 63b26176f10efef2416eb1b75dc355eebb6bf611 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. @@ -194,7 +194,7 @@ index edb173d1..7d08b164 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 d640313a..115f614e 100644 +index ecd3b619..7094fe0b 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,7 +221,7 @@ index d640313a..115f614e 100644 /** * Set of all servers. */ -@@ -68,6 +71,7 @@ public abstract class Configuration implements ProxyConfig +@@ -72,6 +75,7 @@ public abstract class Configuration implements ProxyConfig private boolean preventProxyConnections; private boolean forgeSupport; @@ -229,7 +229,7 @@ index d640313a..115f614e 100644 public void load() { ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter(); -@@ -114,7 +118,7 @@ public abstract class Configuration implements ProxyConfig +@@ -119,7 +123,7 @@ public abstract class Configuration implements ProxyConfig servers = new CaseInsensitiveMap<>( newServers ); } else { @@ -238,7 +238,7 @@ index d640313a..115f614e 100644 for ( ServerInfo oldServer : oldServers.values() ) { -@@ -177,4 +181,71 @@ public abstract class Configuration implements ProxyConfig +@@ -182,4 +186,71 @@ public abstract class Configuration implements ProxyConfig { return favicon; } @@ -311,5 +311,5 @@ index d640313a..115f614e 100644 + // Waterfall end } -- -2.30.1 (Apple Git-130) +2.35.3 diff --git a/BungeeCord-Patches/0028-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0028-Add-timeout-variant-to-connect-methods.patch index 024a56d..bf6e413 100644 --- a/BungeeCord-Patches/0028-Add-timeout-variant-to-connect-methods.patch +++ b/BungeeCord-Patches/0028-Add-timeout-variant-to-connect-methods.patch @@ -1,4 +1,4 @@ -From 66da094f64b5f5089a76994023ec6d0b53a695d2 Mon Sep 17 00:00:00 2001 +From 57112a8044943dd7303081a47fc826d3c339154e 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 @@ -75,10 +75,10 @@ index e7ab62e5..684eb883 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 ef6b3ed6..61e1a9d7 100644 +index 8268e30b..ccb9efdc 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -254,9 +254,20 @@ public final class UserConnection implements ProxiedPlayer +@@ -255,9 +255,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 ef6b3ed6..61e1a9d7 100644 if ( callback != null ) { // Convert the Callback to be compatible with Callback from ServerConnectRequest. -@@ -350,7 +361,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -351,7 +362,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 ef6b3ed6..61e1a9d7 100644 { disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) ); -- -2.35.1 +2.35.3 diff --git a/BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch index 2198b8a..3d296af 100644 --- a/BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch +++ b/BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch @@ -1,14 +1,14 @@ -From 8bcabbb68cb6fbd827fecd2b96afd05107f6cd4a Mon Sep 17 00:00:00 2001 +From 18f888bac2b5402d2ed2e688e184099b4373730d 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 15a61b7e..ee2317e8 100644 +index 35236382..558d0dbb 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 -@@ -8,6 +8,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus; +@@ -10,6 +10,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus; import net.md_5.bungee.protocol.packet.Commands; import net.md_5.bungee.protocol.packet.EncryptionRequest; import net.md_5.bungee.protocol.packet.EncryptionResponse; @@ -17,7 +17,7 @@ index 15a61b7e..ee2317e8 100644 import net.md_5.bungee.protocol.packet.EntityStatus; import net.md_5.bungee.protocol.packet.GameState; import net.md_5.bungee.protocol.packet.Handshake; -@@ -193,4 +195,14 @@ public abstract class AbstractPacketHandler +@@ -213,4 +215,14 @@ public abstract class AbstractPacketHandler public void handle(GameState gameState) throws Exception { } @@ -33,10 +33,10 @@ index 15a61b7e..ee2317e8 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 220365dd..7f0b71c9 100644 +index c4434b24..4a07e5be 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 -@@ -18,6 +18,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest; +@@ -20,6 +20,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest; import net.md_5.bungee.protocol.packet.EncryptionResponse; import net.md_5.bungee.protocol.packet.EntityStatus; import net.md_5.bungee.protocol.packet.GameState; @@ -45,9 +45,9 @@ index 220365dd..7f0b71c9 100644 import net.md_5.bungee.protocol.packet.Handshake; import net.md_5.bungee.protocol.packet.KeepAlive; import net.md_5.bungee.protocol.packet.Kick; -@@ -120,6 +122,20 @@ public enum Protocol - map( ProtocolConstants.MINECRAFT_1_16, 0x0C ), - map( ProtocolConstants.MINECRAFT_1_17, 0x0D ) +@@ -133,6 +135,20 @@ public enum Protocol + PlayerChat::new, + map( ProtocolConstants.MINECRAFT_1_19, 0x30 ) ); + // Waterfall start + TO_CLIENT.registerPacket( @@ -66,7 +66,7 @@ index 220365dd..7f0b71c9 100644 TO_CLIENT.registerPacket( PlayerListItem.class, // PlayerInfo PlayerListItem::new, -@@ -571,10 +587,11 @@ public enum Protocol +@@ -618,10 +634,11 @@ public enum Protocol mappingIndex++; } } @@ -173,7 +173,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 61e1a9d7..2cbf002e 100644 +index ccb9efdc..c96117c6 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 @@ @@ -186,7 +186,7 @@ index 61e1a9d7..2cbf002e 100644 import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; -@@ -124,6 +126,10 @@ public final class UserConnection implements ProxiedPlayer +@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer private final Scoreboard serverSentScoreboard = new Scoreboard(); @Getter private final Collection sentBossBars = new HashSet<>(); @@ -281,5 +281,5 @@ index d15044f4..bea2bbff 100644 * Sends the server mod list to the client, or stores it for sending later. * -- -2.35.1 +2.35.3 diff --git a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch index 193efc3..328f9f6 100644 --- a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch +++ b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch @@ -1,4 +1,4 @@ -From 229256284f51ef81fc9771c0fc7bccb4d65e4c5e Mon Sep 17 00:00:00 2001 +From 5d176c6b2a2098239679debe4aa65787a553366c 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 b3a70840..00ce099c 100644 +index cf7ef042..688f1b99 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -49,6 +49,9 @@ @@ -39,7 +39,7 @@ index b3a70840..00ce099c 100644 diff --git a/log4j/pom.xml b/log4j/pom.xml new file mode 100644 -index 00000000..08316eea +index 00000000..44bf7f91 --- /dev/null +++ b/log4j/pom.xml @@ -0,0 +1,48 @@ @@ -50,13 +50,13 @@ index 00000000..08316eea + + io.github.waterfallmc + waterfall-parent -+ 1.18-R0.1-SNAPSHOT ++ 1.19-R0.1-SNAPSHOT + ../pom.xml + + + io.github.waterfallmc + waterfall-log4j -+ 1.18-R0.1-SNAPSHOT ++ 1.19-R0.1-SNAPSHOT + jar + + Waterfall-Log @@ -206,10 +206,10 @@ index 00000000..e43f5dac +log4j.skipJansi=true diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml new file mode 100644 -index 00000000..cfd039cd +index 00000000..e32dd7b5 --- /dev/null +++ b/log4j/src/main/resources/log4j2.xml -@@ -0,0 +1,22 @@ +@@ -0,0 +1,24 @@ + + + @@ -232,8 +232,10 @@ index 00000000..cfd039cd + + + ++io/github/waterfallmc/waterfall/log4j/WaterfallLogger.class ++io/github/waterfallmc/waterfall/log4j/Log4JLogHandler.class diff --git a/pom.xml b/pom.xml -index f371e3dd..505d1d14 100644 +index fad424b6..2b544c23 100644 --- a/pom.xml +++ b/pom.xml @@ -56,11 +56,12 @@ @@ -251,7 +253,7 @@ index f371e3dd..505d1d14 100644 diff --git a/proxy/pom.xml b/proxy/pom.xml -index c3ef3c8e..23bfa61d 100644 +index 8506b681..205162db 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -71,7 +71,7 @@ @@ -279,7 +281,7 @@ index c3ef3c8e..23bfa61d 100644 net.sf.jopt-simple jopt-simple @@ -130,6 +131,25 @@ - 1.7.2 + 1.8.0 runtime + @@ -303,7 +305,7 @@ index c3ef3c8e..23bfa61d 100644 + - + diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java new file mode 100644 index 00000000..765d24bc @@ -548,7 +550,7 @@ index 7e465924..00000000 - diff --git a/slf4j/pom.xml b/slf4j/pom.xml deleted file mode 100644 -index 293597b6..00000000 +index b995ba85..00000000 --- a/slf4j/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ @@ -560,13 +562,13 @@ index 293597b6..00000000 - - net.md-5 - bungeecord-parent -- 1.18-R0.1-SNAPSHOT +- 1.19-R0.1-SNAPSHOT - ../pom.xml - - - net.md-5 - bungeecord-slf4j -- 1.18-R0.1-SNAPSHOT +- 1.19-R0.1-SNAPSHOT - jar - - BungeeCord-SLF4J @@ -1616,5 +1618,5 @@ index 21a48df6..00000000 - -} -- -2.36.0 +2.35.3 diff --git a/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch index a4c8d6e..2eae907 100644 --- a/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch +++ b/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch @@ -1,4 +1,4 @@ -From da23eb1af3034f77bc848a4a0ade1c73185ba9a1 Mon Sep 17 00:00:00 2001 +From 024863bb9a8e05fd8a0f686789058d75ca352140 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 @@ -52,10 +52,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 61e8e9a7..8f34a575 100644 +index bb227151..dd3f634b 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 -@@ -554,7 +554,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -580,7 +580,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection }; // fire login event @@ -65,5 +65,5 @@ index 61e8e9a7..8f34a575 100644 @Override -- -2.33.0 +2.35.3 diff --git a/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch index 606260f..88c9c86 100644 --- a/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch +++ b/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch @@ -1,4 +1,4 @@ -From 8a71e0d94cbfec7d165a5502a700ddc23d5e356b Mon Sep 17 00:00:00 2001 +From 05d7b94ad0595d30841f876dec59c7860a5a6dac 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,10 +61,10 @@ index ef44d334..4ff8da6d 100644 public String getGameVersion() { return gameVersion; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 8f34a575..b634d256 100644 +index dd3f634b..edd44135 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 -@@ -331,7 +331,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -333,7 +333,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection break; case 2: // Login @@ -77,5 +77,5 @@ index 8f34a575..b634d256 100644 ch.setProtocol( Protocol.LOGIN ); -- -2.33.0 +2.35.3 diff --git a/BungeeCord-Patches/0042-Forge-is-a-first-class-citizen.patch b/BungeeCord-Patches/0042-Forge-is-a-first-class-citizen.patch index fafc145..bf0f5be 100644 --- a/BungeeCord-Patches/0042-Forge-is-a-first-class-citizen.patch +++ b/BungeeCord-Patches/0042-Forge-is-a-first-class-citizen.patch @@ -1,11 +1,11 @@ -From 8a58eb07a988a46d9f444d67484842b58d38917a Mon Sep 17 00:00:00 2001 +From 27713874f8c4678f4aaa03278614388d897a207c 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 f281dfa1..c5f2a92d 100644 +index 66d38b40..06784d1e 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -281,8 +281,6 @@ public class BungeeCord extends ProxyServer @@ -18,10 +18,10 @@ index f281dfa1..c5f2a92d 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 115f614e..85d2197a 100644 +index 7094fe0b..8911bee8 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 -@@ -69,7 +69,7 @@ public abstract class Configuration implements ProxyConfig +@@ -73,7 +73,7 @@ public abstract class Configuration implements ProxyConfig private Favicon favicon; private int compressionThreshold = 256; private boolean preventProxyConnections; @@ -31,5 +31,5 @@ index 115f614e..85d2197a 100644 @Synchronized("serversLock") // Waterfall public void load() -- -2.30.1 (Apple Git-130) +2.35.3 diff --git a/BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch index d88e2c0..dc43d40 100644 --- a/BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch +++ b/BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch @@ -1,4 +1,4 @@ -From 687c783914c5c79bc62ee5fd9df3cb187861b376 Mon Sep 17 00:00:00 2001 +From f09ea1e473ec0fd3bd52fef0c8d32b7f22bebe04 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,7 +57,7 @@ index 4ff8da6d..e860214f 100644 + } } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index 5595278b..9e74d158 100644 +index e29fdf9a..ba7fc59c 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -240,7 +240,7 @@ public class ServerConnector extends PacketHandler @@ -85,14 +85,14 @@ index 5595278b..9e74d158 100644 serverScoreboard.clear(); for ( UUID bossbar : user.getSentBossBars() ) -@@ -323,12 +325,35 @@ public class ServerConnector extends PacketHandler +@@ -323,13 +325,37 @@ public class ServerConnector extends PacketHandler } user.setDimensionChange( true ); - if ( login.getDimension() == user.getDimension() ) + if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer { - user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) ); + user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) ); } user.setServerEntityId( login.getEntityId() ); @@ -105,28 +105,30 @@ index 5595278b..9e74d158 100644 + // Only send if we are not in the same dimension + if ( login.getDimension() != user.getDimension() ) // Waterfall - defer + { -+ user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) ); ++ user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) ); + } + + 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.isDebug(), login.isFlat() ); ++ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), login.getDeathLocation() ); + user.unsafe().sendPacket(modLogin); + + // Only send if we're in the same dimension + if ( login.getDimension() == user.getDimension() ) // Waterfall - defer + { -+ user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) ); ++ user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) ); + } + } + // Waterfall end - user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) ); + user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) ); ++ if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 ) { + user.unsafe().sendPacket( new ViewDistance( login.getViewDistance() ) ); 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 2cbf002e..17f68fd7 100644 +index c96117c6..9600381f 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -758,4 +758,10 @@ public final class UserConnection implements ProxiedPlayer +@@ -769,4 +769,10 @@ public final class UserConnection implements ProxiedPlayer { return serverSentScoreboard; } @@ -158,18 +160,10 @@ index b5f8c473..01b29247 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 f87ce538..cda6451d 100644 +index 45c2bea6..59d63cc2 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 -@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream; - import java.io.DataInputStream; - import lombok.AccessLevel; - import lombok.NoArgsConstructor; -+ - import net.md_5.bungee.protocol.DefinedPacket; - import net.md_5.bungee.protocol.ProtocolConstants; - import se.llbit.nbt.NamedTag; -@@ -27,6 +28,11 @@ public abstract class EntityMap +@@ -27,6 +27,11 @@ public abstract class EntityMap // Returns the correct entity map for the protocol version public static EntityMap getEntityMap(int version) { @@ -181,7 +175,7 @@ index f87ce538..cda6451d 100644 switch ( version ) { case ProtocolConstants.MINECRAFT_1_8: -@@ -290,7 +296,13 @@ public abstract class EntityMap +@@ -292,7 +297,13 @@ public abstract class EntityMap DefinedPacket.readVarInt( packet ); break; default: @@ -234,5 +228,5 @@ index 00000000..cb81d1dd +// Waterfall end \ No newline at end of file -- -2.35.1 +2.35.3 diff --git a/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch index bc5a699..8b1a66f 100644 --- a/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch +++ b/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch @@ -1,4 +1,4 @@ -From 8bcafa4ef75dec34e916726104eae43f65bd6df3 Mon Sep 17 00:00:00 2001 +From 9ef43c2b8ed992ad9637f1fae53685c0d728a6e1 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 @@ -67,7 +67,7 @@ index 6c0ef4df..f20104a2 100644 + // Waterfall end } diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java -index ab9519f9..40281aa4 100644 +index 9d7d4b9a..18e548df 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 @@ -19,6 +19,9 @@ import se.llbit.nbt.Tag; @@ -133,7 +133,7 @@ index 00000000..2583aa2c + } +} diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java -index 8b7e0708..37d28c01 100644 +index b68b33a9..f5e414c1 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java @@ -78,7 +78,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder @@ -146,10 +146,10 @@ index 8b7e0708..37d28c01 100644 { if ( slice != null ) diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index b634d256..2d7101ff 100644 +index edd44135..08af9d08 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 -@@ -14,6 +14,8 @@ import java.util.Set; +@@ -15,6 +15,8 @@ import java.util.Set; import java.util.UUID; import java.util.logging.Level; import javax.crypto.SecretKey; @@ -158,8 +158,8 @@ index b634d256..2d7101ff 100644 import lombok.Getter; import lombok.RequiredArgsConstructor; import net.md_5.bungee.BungeeCord; -@@ -419,6 +421,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection - Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" ); +@@ -445,6 +447,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection + Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" ); SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); + // Waterfall start @@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644 // Waterfall start -- -2.33.0 +2.35.3 diff --git a/BungeeCord-Patches/0055-Add-auth-url-option.patch b/BungeeCord-Patches/0055-Add-auth-url-option.patch index 9dfad19..2b5edbc 100644 --- a/BungeeCord-Patches/0055-Add-auth-url-option.patch +++ b/BungeeCord-Patches/0055-Add-auth-url-option.patch @@ -1,14 +1,14 @@ -From 24e8f66309237a5f4d54f49ffe7af021566c6ecd Mon Sep 17 00:00:00 2001 +From b78de0f634a40113cb39413031632f37d1416477 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 2d7101ff..c3e60fa5 100644 +index 08af9d08..86d28d1c 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; +@@ -76,6 +76,8 @@ import net.md_5.bungee.util.QuietException; public class InitialHandler extends PacketHandler implements PendingConnection { @@ -17,7 +17,7 @@ index 2d7101ff..c3e60fa5 100644 private final BungeeCord bungee; private ChannelWrapper ch; @Getter -@@ -447,7 +449,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -473,7 +475,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 2d7101ff..c3e60fa5 100644 Callback handler = new Callback() { -- -2.33.0 +2.35.3 diff --git a/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch b/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch index 6c49380..cc72f9d 100644 --- a/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch +++ b/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch @@ -1,4 +1,4 @@ -From a97fd919809d2284cdc6a5d68168c99bfe795d9c Mon Sep 17 00:00:00 2001 +From 75a3cc5b687afea868a4e07e79b17a98c0a15d45 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,7 +8,7 @@ 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 40281aa4..a310844d 100644 +index 18e548df..55c6ee72 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 @@ -44,6 +44,7 @@ public abstract class DefinedPacket @@ -27,7 +27,7 @@ index 40281aa4..a310844d 100644 throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" ); } -@@ -284,4 +286,21 @@ public abstract class DefinedPacket +@@ -345,4 +347,21 @@ public abstract class DefinedPacket @Override public abstract String toString(); @@ -145,12 +145,12 @@ index f5e414c1..ac83e325 100644 + // Waterfall end } diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java -index 388f6cdb..53575ce0 100644 +index 8a60be9f..3a38d05a 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java -@@ -38,4 +38,16 @@ public class EncryptionResponse extends DefinedPacket - { - handler.handle( this ); +@@ -63,4 +63,16 @@ public class EncryptionResponse extends DefinedPacket + private final long salt; + private final byte[] signature; } + + // Waterfall start: Additional DoS mitigations, courtesy of Velocity @@ -166,18 +166,10 @@ index 388f6cdb..53575ce0 100644 + // Waterfall end } diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java -index 08ee376e..cfd8e64e 100644 +index 8b148625..944ef000 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java -@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; - import lombok.NoArgsConstructor; - import net.md_5.bungee.protocol.AbstractPacketHandler; - import net.md_5.bungee.protocol.DefinedPacket; -+import net.md_5.bungee.protocol.ProtocolConstants; - - @Data - @NoArgsConstructor -@@ -34,4 +35,12 @@ public class LoginRequest extends DefinedPacket +@@ -45,4 +45,12 @@ public class LoginRequest extends DefinedPacket { handler.handle( this ); } @@ -241,5 +233,5 @@ index 738f0c92..ec33d337 100644 + // Waterfall end } -- -2.34.1 +2.35.3 diff --git a/BungeeCord-Patches/0061-Configurable-plugin-messaging-limits.patch b/BungeeCord-Patches/0061-Configurable-plugin-messaging-limits.patch index 0a10711..0361fbe 100644 --- a/BungeeCord-Patches/0061-Configurable-plugin-messaging-limits.patch +++ b/BungeeCord-Patches/0061-Configurable-plugin-messaging-limits.patch @@ -1,4 +1,4 @@ -From cffebb622018407da2281f266d82acce6b752cac Mon Sep 17 00:00:00 2001 +From 887e10d7d4ecb72a8204708591dc90deb0f5dd61 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 527f310e..e31fb00a 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 c3e60fa5..4afab05d 100644 +index 86d28d1c..51d5bde4 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 -@@ -682,9 +682,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -708,9 +708,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection for ( String id : content.split( "\0" ) ) { @@ -101,5 +101,5 @@ index c3e60fa5..4afab05d 100644 } } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) ) -- -2.33.1 +2.35.3 diff --git a/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch b/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch index e8fa66c..224781a 100644 --- a/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch +++ b/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch @@ -1,4 +1,4 @@ -From 25da19dc4b4ca0bf9191889cfc23562f7e3035f9 Mon Sep 17 00:00:00 2001 +From 81f33d0361fe054eb0b66be221ba133b2807bc7f 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 17f68fd7..4a858f31 100644 +index 9600381f..76ab395f 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -267,12 +267,16 @@ public final class UserConnection implements ProxiedPlayer +@@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout); } @@ -53,7 +53,7 @@ index 17f68fd7..4a858f31 100644 builder.connectTimeout(timeout); // Waterfall if ( callback != null ) { -@@ -320,7 +324,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -321,7 +325,7 @@ public final class UserConnection implements ProxiedPlayer callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null ); } @@ -62,7 +62,7 @@ index 17f68fd7..4a858f31 100644 return; } if ( pendingConnects.contains( target ) ) -@@ -330,7 +334,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -331,7 +335,7 @@ public final class UserConnection implements ProxiedPlayer callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null ); } @@ -71,7 +71,7 @@ index 17f68fd7..4a858f31 100644 return; } -@@ -366,14 +370,14 @@ public final class UserConnection implements ProxiedPlayer +@@ -367,14 +371,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 17f68fd7..4a858f31 100644 } } -- -2.35.1 +2.35.3 diff --git a/BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch b/BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch index 26357b5..a0ad114 100644 --- a/BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch +++ b/BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch @@ -1,4 +1,4 @@ -From 5b153f56ace64a77b2194c64ea8948c536872998 Mon Sep 17 00:00:00 2001 +From b6efd29f61cc65d119459129bef01fa9c597f0ab 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 888218a0..7c52ee9a 100644 +index 76ab395f..b7d363b8 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -398,7 +398,8 @@ public final class UserConnection implements ProxiedPlayer +@@ -399,7 +399,8 @@ public final class UserConnection implements ProxiedPlayer private String connectionFailMessage(Throwable cause) { @@ -27,5 +27,5 @@ index 888218a0..7c52ee9a 100644 @Override -- -2.36.0 +2.35.3 diff --git a/BungeeCord-Patches/0064-Improve-login-state-transition.patch b/BungeeCord-Patches/0064-Improve-login-state-transition.patch index aa7f28e..b0c8d4f 100644 --- a/BungeeCord-Patches/0064-Improve-login-state-transition.patch +++ b/BungeeCord-Patches/0064-Improve-login-state-transition.patch @@ -1,22 +1,22 @@ -From 0bd925e5105a87acd24f93690a310b2b3d4e2d41 Mon Sep 17 00:00:00 2001 +From 1e23d498d1dfb7fde40e21640d9635781fa5cd87 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 4afab05d..bba6d324 100644 +index 51d5bde4..c973ca63 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 -@@ -421,6 +421,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection - public void handle(final EncryptionResponse encryptResponse) throws Exception +@@ -447,6 +447,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" ); + thisState = State.FINISHING; // Waterfall - move earlier - There is no verification of this later (and this is not API) SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); // Waterfall start -@@ -475,7 +476,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -501,7 +502,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection } } }; @@ -26,5 +26,5 @@ index 4afab05d..bba6d324 100644 } -- -2.36.0 +2.35.3