From 46fa4cf7421daebe5f6d26c651a5347a0809dc4f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 15 Sep 2020 17:21:52 +0100 Subject: [PATCH] Rebuild patches --- ...55-Allow-to-disable-tablist-rewrite.patch} | 24 +++++++++---------- ...tab-complete-packets-to-servers-max.patch} | 4 ++-- ...0057-Remove-version-from-brand-info.patch} | 8 +++---- ...n.patch => 0058-Add-auth-url-option.patch} | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) rename BungeeCord-Patches/{0054-Allow-to-disable-tablist-rewrite.patch => 0055-Allow-to-disable-tablist-rewrite.patch} (81%) rename BungeeCord-Patches/{0055-Cap-tab-complete-packets-to-servers-max.patch => 0056-Cap-tab-complete-packets-to-servers-max.patch} (92%) rename BungeeCord-Patches/{0056-Remove-version-from-brand-info.patch => 0057-Remove-version-from-brand-info.patch} (85%) rename BungeeCord-Patches/{0057-Add-auth-url-option.patch => 0058-Add-auth-url-option.patch} (94%) diff --git a/BungeeCord-Patches/0054-Allow-to-disable-tablist-rewrite.patch b/BungeeCord-Patches/0055-Allow-to-disable-tablist-rewrite.patch similarity index 81% rename from BungeeCord-Patches/0054-Allow-to-disable-tablist-rewrite.patch rename to BungeeCord-Patches/0055-Allow-to-disable-tablist-rewrite.patch index 0038f0b..4d73b30 100644 --- a/BungeeCord-Patches/0054-Allow-to-disable-tablist-rewrite.patch +++ b/BungeeCord-Patches/0055-Allow-to-disable-tablist-rewrite.patch @@ -1,14 +1,14 @@ -From 40c75152f0c14adf2b7b2cd609f397993908e3fb Mon Sep 17 00:00:00 2001 +From fb7568a79620b227112e820f4b3e7e88d64afe70 Mon Sep 17 00:00:00 2001 From: xDark Date: Fri, 31 May 2019 08:11:31 +0300 Subject: [PATCH] Allow to disable tablist rewrite diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java -index cbcf8a24..4222db77 100644 +index 4a198ee9..d69463f0 100644 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java -@@ -239,4 +239,10 @@ public interface ProxyConfig +@@ -255,4 +255,10 @@ public interface ProxyConfig * @return Should we disable entity metadata rewriting? */ boolean isDisableEntityMetadataRewrite(); @@ -20,26 +20,26 @@ index cbcf8a24..4222db77 100644 + boolean isDisableTabListRewrite(); } diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java -index 41a71f65..6929e51c 100644 +index e860214f..527f310e 100644 --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java -@@ -54,6 +54,7 @@ public class WaterfallConfiguration extends Configuration { - private boolean allowEmptyPackets = false; +@@ -43,6 +43,7 @@ public class WaterfallConfiguration extends Configuration { + private boolean disableModernTabLimiter = true; private boolean disableEntityMetadataRewrite = false; + private boolean disableTabListRewrite = false; @Override public void load() { -@@ -68,6 +69,7 @@ public class WaterfallConfiguration extends Configuration { +@@ -56,6 +57,7 @@ public class WaterfallConfiguration extends Configuration { + tabThrottle = config.getInt("throttling.tab_complete", tabThrottle); disableModernTabLimiter = config.getBoolean("disable_modern_tab_limiter", disableModernTabLimiter); - allowEmptyPackets = config.getBoolean("allow_empty_packets", allowEmptyPackets); disableEntityMetadataRewrite = config.getBoolean("disable_entity_metadata_rewrite", disableEntityMetadataRewrite); + disableTabListRewrite = config.getBoolean("disable_tab_list_rewrite", disableTabListRewrite); } @Override -@@ -104,4 +106,9 @@ public class WaterfallConfiguration extends Configuration { +@@ -87,4 +89,9 @@ public class WaterfallConfiguration extends Configuration { public boolean isDisableEntityMetadataRewrite() { return disableEntityMetadataRewrite; } @@ -50,10 +50,10 @@ index 41a71f65..6929e51c 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 1f8a2439..cd1f4c9f 100644 +index ace177ba..f4494898 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 -@@ -150,8 +150,14 @@ public class DownstreamBridge extends PacketHandler +@@ -162,8 +162,14 @@ public class DownstreamBridge extends PacketHandler @Override public void handle(PlayerListItem playerList) throws Exception { @@ -71,5 +71,5 @@ index 1f8a2439..cd1f4c9f 100644 @Override -- -2.21.0.windows.1 +2.28.0 diff --git a/BungeeCord-Patches/0055-Cap-tab-complete-packets-to-servers-max.patch b/BungeeCord-Patches/0056-Cap-tab-complete-packets-to-servers-max.patch similarity index 92% rename from BungeeCord-Patches/0055-Cap-tab-complete-packets-to-servers-max.patch rename to BungeeCord-Patches/0056-Cap-tab-complete-packets-to-servers-max.patch index 2110d76..9392da2 100644 --- a/BungeeCord-Patches/0055-Cap-tab-complete-packets-to-servers-max.patch +++ b/BungeeCord-Patches/0056-Cap-tab-complete-packets-to-servers-max.patch @@ -1,4 +1,4 @@ -From 3032acddf93d4669da3bf3b8c3c926994517e693 Mon Sep 17 00:00:00 2001 +From e668f69d4329b3fbdf1d4a088c42edb48b898e57 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 9 May 2020 21:40:23 -0400 Subject: [PATCH] Cap tab complete packets to servers max @@ -18,5 +18,5 @@ index d6865ae2..3e4ea192 100644 if ( protocolVersion < ProtocolConstants.MINECRAFT_1_13 ) { -- -2.27.0 +2.28.0 diff --git a/BungeeCord-Patches/0056-Remove-version-from-brand-info.patch b/BungeeCord-Patches/0057-Remove-version-from-brand-info.patch similarity index 85% rename from BungeeCord-Patches/0056-Remove-version-from-brand-info.patch rename to BungeeCord-Patches/0057-Remove-version-from-brand-info.patch index ce48c69..38e87b4 100644 --- a/BungeeCord-Patches/0056-Remove-version-from-brand-info.patch +++ b/BungeeCord-Patches/0057-Remove-version-from-brand-info.patch @@ -1,14 +1,14 @@ -From 4642c2478a65a01c7e5cefc3827e2e546664e7d7 Mon Sep 17 00:00:00 2001 +From 2376fd17ecc830b3d19db344e3c03156939a0bae Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 20 Jun 2020 18:21:17 +0100 Subject: [PATCH] Remove version from brand info diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -index 4a60ba5b..44e6ed3f 100644 +index f4494898..9e180c30 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 -@@ -287,7 +287,7 @@ public class DownstreamBridge extends PacketHandler +@@ -293,7 +293,7 @@ public class DownstreamBridge extends PacketHandler Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" ); brand = ByteBufAllocator.DEFAULT.heapBuffer(); @@ -18,5 +18,5 @@ index 4a60ba5b..44e6ed3f 100644 brand.release(); // changes in the packet are ignored so we need to send it manually -- -2.24.0 +2.28.0 diff --git a/BungeeCord-Patches/0057-Add-auth-url-option.patch b/BungeeCord-Patches/0058-Add-auth-url-option.patch similarity index 94% rename from BungeeCord-Patches/0057-Add-auth-url-option.patch rename to BungeeCord-Patches/0058-Add-auth-url-option.patch index 5fa5dd6..f1f5a91 100644 --- a/BungeeCord-Patches/0057-Add-auth-url-option.patch +++ b/BungeeCord-Patches/0058-Add-auth-url-option.patch @@ -1,11 +1,11 @@ -From 18de08eb94180ea4cd7742e326b366b08a753774 Mon Sep 17 00:00:00 2001 +From 80b2f3785af009bef64f05e3832e833298d6cafd 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 b848e451..4b40b465 100644 +index 3d3b2352..7e6027aa 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 @@ -70,6 +70,8 @@ import net.md_5.bungee.util.QuietException;