Skip to content

Updated Upstream (BungeeCord), drop macOS natives, default native cipher off #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
electronicboy merged 3 commits into from
Sep 1, 2026
Merged

Updated Upstream (BungeeCord), drop macOS natives, default native cipher off #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c0c133
Updated Upstream (BungeeCord)
electronicboy Aug 31, 2026
726b22f
Bump jline to 4.4.0
electronicboy Aug 31, 2026
2ee0eba
Drop macOS natives, default the native cipher to off
electronicboy Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BungeeCord
Open in desktop
Submodule BungeeCord updated 16 files
+1 −1 .github/workflows/maven.yml
+1 −1 .gitmodules
+1 −1 bootstrap/pom.xml
+1 −1 log/pom.xml
+2 −2 native/compile-native-arm.sh
+2 −2 native/compile-native.sh
+14 −14 native/src/main/c/NativeCompressImpl.c
+ − native/src/main/resources/native-compress-arm.so
+ − native/src/main/resources/native-compress.so
+1 −1 native/zlib
+4 −4 pom.xml
+1 −1 protocol/pom.xml
+61 −45 protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
+1 −1 proxy/pom.xml
+1 −1 proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+13 −9 proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
8 changes: 4 additions & 4 deletions BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From df0cd822b690ecbe7af7fe9077b35542ecbfe938 Mon Sep 17 00:00:00 2001
From 3c07de0dc3367bda2bf2411f9d2e41d8b884f45a Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling
Expand Down Expand Up @@ -73,7 +73,7 @@ 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 c966c6fc..85659f4b 100644
index 9ba1af5e..34f5ea0f 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
@@ -50,6 +50,8 @@ public class UpstreamBridge extends PacketHandler
Expand All @@ -85,7 +85,7 @@ index c966c6fc..85659f4b 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -198,6 +200,20 @@ public class UpstreamBridge extends PacketHandler
@@ -202,6 +204,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
Expand All @@ -107,5 +107,5 @@ index c966c6fc..85659f4b 100644
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.53.0
2.43.0

12 changes: 6 additions & 6 deletions BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 87293c7fcf50eb37fa20372140bf4c3092be86fa Mon Sep 17 00:00:00 2001
From c96240cc4643fb2c083b6b76071a3546a5578159 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Improve server list ping logging
Expand All @@ -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 102ccb5c..2a92388f 100644
index f8f7d7db..e80a0278 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -544,6 +544,6 @@ public class ServerConnector extends PacketHandler
Expand All @@ -19,7 +19,7 @@ index 102ccb5c..2a92388f 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 c41b4f71..34860ba2 100644
index 0823b12d..9bae4c09 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
@@ -806,20 +806,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Expand All @@ -45,10 +45,10 @@ index c41b4f71..34860ba2 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 85659f4b..403c4fe2 100644
index 34f5ea0f..1dae5d2f 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
@@ -385,6 +385,6 @@ public class UpstreamBridge extends PacketHandler
@@ -389,6 +389,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{
Expand All @@ -57,5 +57,5 @@ index 85659f4b..403c4fe2 100644
}
}
--
2.53.0
2.43.0

14 changes: 7 additions & 7 deletions BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 06d49b3b7be479a8255779c817bd79043c76b518 Mon Sep 17 00:00:00 2001
From 29ff12beedfac72dbd5d8da7ce3c29981fefbdfe Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
console


diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index fd082dcd..d090e151 100644
index 31077ba7..d037f343 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,8 @@
Expand Down Expand Up @@ -231,7 +231,7 @@ index 00000000..cfd039cd
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index a11d5b50..03246559 100644
index 35c4f077..5edd72e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,14 +58,15 @@
Expand Down Expand Up @@ -287,7 +287,7 @@ index a11d5b50..03246559 100644
</rules>
</configuration>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 453e269b..70cc35b6 100644
index 9b30a1b2..81e42070 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -45,6 +45,7 @@
Expand Down Expand Up @@ -352,13 +352,13 @@ index 453e269b..70cc35b6 100644
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-terminal-ffm</artifactId>
+ <version>4.1.3</version>
+ <version>4.4.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-terminal-jni</artifactId>
+ <version>4.1.3</version>
+ <version>4.4.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- Waterfall end -->
Expand Down Expand Up @@ -682,5 +682,5 @@ index 6788fbe7..00000000
- }
-}
--
2.54.0
2.43.0

Loading
Loading