Rebuild patches

This commit is contained in:
Shane Freeder 2020-09-15 17:21:52 +01:00
parent fae68b0a39
commit 46fa4cf742
4 changed files with 20 additions and 20 deletions

View File

@ -1,14 +1,14 @@
From 40c75152f0c14adf2b7b2cd609f397993908e3fb Mon Sep 17 00:00:00 2001
From fb7568a79620b227112e820f4b3e7e88d64afe70 Mon Sep 17 00:00:00 2001
From: xDark <aleshkailyashevich@gmail.com>
Date: Fri, 31 May 2019 08:11:31 +0300
Subject: [PATCH] Allow to disable tablist rewrite
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

View File

@ -1,4 +1,4 @@
From 3032acddf93d4669da3bf3b8c3c926994517e693 Mon Sep 17 00:00:00 2001
From e668f69d4329b3fbdf1d4a088c42edb48b898e57 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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

View File

@ -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 <theboyetronic@gmail.com>
Date: Sat, 20 Jun 2020 18:21:17 +0100
Subject: [PATCH] Remove version from brand info
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 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

View File

@ -1,11 +1,11 @@
From 18de08eb94180ea4cd7742e326b366b08a753774 Mon Sep 17 00:00:00 2001
From 80b2f3785af009bef64f05e3832e833298d6cafd Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Sun, 19 Jul 2020 10:18:23 +1000
Subject: [PATCH] Add auth url option
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 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;