Skip to content

Commit 5254ae0

Browse files
committed
Updated Upstream (BungeeCord)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: b34cfcde Simplify UpstreamBridge packet handling code 86e079a4 #3523, #3534: Fix kicking players with error 1c42c340 #3529: Use a synchronized list for /send command
1 parent 6fbf437 commit 5254ae0

4 files changed

+12
-12
lines changed

BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 08dbc9c2496f4c0f1d531a6a22c56e067f0f40fd Mon Sep 17 00:00:00 2001
1+
From a5ce9cf6ba775ef5163c65cd7f1bafd6cc4ba1d1 Mon Sep 17 00:00:00 2001
22
From: Johannes Donath <[email protected]>
33
Date: Sat, 4 Jul 2015 06:31:33 +0200
44
Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -73,10 +73,10 @@ index 741ebfde..91743f01 100644
7373
+ }
7474
}
7575
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
76-
index fdc29b6a..0e5d0a47 100644
76+
index 3c312589..d8c1c040 100644
7777
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
7878
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
79-
@@ -48,6 +48,8 @@ public class UpstreamBridge extends PacketHandler
79+
@@ -49,6 +49,8 @@ public class UpstreamBridge extends PacketHandler
8080
private final ProxyServer bungee;
8181
private final UserConnection con;
8282

@@ -85,7 +85,7 @@ index fdc29b6a..0e5d0a47 100644
8585
public UpstreamBridge(ProxyServer bungee, UserConnection con)
8686
{
8787
this.bungee = bungee;
88-
@@ -221,6 +223,20 @@ public class UpstreamBridge extends PacketHandler
88+
@@ -223,6 +225,20 @@ public class UpstreamBridge extends PacketHandler
8989
@Override
9090
public void handle(TabCompleteRequest tabComplete) throws Exception
9191
{

BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From eba275ee93b6bc3a7159b427138320eeb8eaa30c Mon Sep 17 00:00:00 2001
1+
From 0176a0d6c9210a5799e6f745ad6c400eb814f40a Mon Sep 17 00:00:00 2001
22
From: Janmm14 <[email protected]>
33
Date: Sat, 12 Dec 2015 23:43:30 +0100
44
Subject: [PATCH] Improve server list ping logging
@@ -57,10 +57,10 @@ index c1e5a156..1f9a54f2 100644
5757

5858
@Override
5959
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
60-
index 0e5d0a47..37178082 100644
60+
index d8c1c040..045e9545 100644
6161
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
6262
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
63-
@@ -372,6 +372,6 @@ public class UpstreamBridge extends PacketHandler
63+
@@ -374,6 +374,6 @@ public class UpstreamBridge extends PacketHandler
6464
@Override
6565
public String toString()
6666
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
From edcda91b4d88b9f37535a113a73922709b86527a Mon Sep 17 00:00:00 2001
1+
From aa9261c4f9c7cac4124d7c144038b033952b3503 Mon Sep 17 00:00:00 2001
22
From: Tux <[email protected]>
33
Date: Tue, 25 Oct 2016 12:34:41 -0400
44
Subject: [PATCH] Validate that chat messages are non-blank
55

66

77
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
8-
index 37178082..57d09507 100644
8+
index 045e9545..212cdbf2 100644
99
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
1010
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
11-
@@ -198,6 +198,7 @@ public class UpstreamBridge extends PacketHandler
11+
@@ -200,6 +200,7 @@ public class UpstreamBridge extends PacketHandler
1212

1313
private String handleChat(String message)
1414
{
1515
+ boolean empty = true;
1616
for ( int index = 0, length = message.length(); index < length; index++ )
1717
{
1818
char c = message.charAt( index );
19-
@@ -205,8 +206,14 @@ public class UpstreamBridge extends PacketHandler
19+
@@ -207,8 +208,14 @@ public class UpstreamBridge extends PacketHandler
2020
{
2121
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
2222
throw CancelSendSignal.INSTANCE;

0 commit comments

Comments
 (0)