Updated Upstream (BungeeCord) (#643)

Upstream has released updates that appears 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:
5823f474 #3090: Register events in parent classes
a0b7f092 #3087: Force-enable multi-release jar file support for JDK9+ via System property
This commit is contained in:
Luccboy 2021-05-21 09:58:24 +02:00 committed by GitHub
parent ab893721bd
commit f7c7b4820c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 26 deletions

@ -1 +1 @@
Subproject commit b60a30c70546c1e24869ebce195af6195e8ccd12
Subproject commit 5823f47467cc1ad981adbcec30c3db0200ee2409

View File

@ -1,4 +1,4 @@
From 89ae104b3d0ab58d2ebb90d336173202455c9dd6 Mon Sep 17 00:00:00 2001
From b0de2554f0190d95e95741474113e9665c7bbdfd Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall
@ -40,10 +40,10 @@ index f80c0486..998316c3 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index 01ec0cae..4ba0ced5 100644
index 7281d6b2..39fc55f9 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -49,7 +49,7 @@ public class BungeeCordLauncher
@@ -54,7 +54,7 @@ public class BungeeCordLauncher
if ( buildDate.before( deadline.getTime() ) )
{
System.err.println( "*** Warning, this build is outdated ***" );
@ -52,7 +52,7 @@ index 01ec0cae..4ba0ced5 100644
System.err.println( "*** You will get NO support regarding this build ***" );
System.err.println( "*** Server will start in 10 seconds ***" );
Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
@@ -58,7 +58,7 @@ public class BungeeCordLauncher
@@ -63,7 +63,7 @@ public class BungeeCordLauncher
BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );
@ -101,5 +101,5 @@ index c0620445..e65558ad 100644
SocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.31.1
2.31.1.windows.1

View File

@ -1,14 +1,14 @@
From 6b65cdbb77af57bb0c447cfbf2c8e0b0f5e129af Mon Sep 17 00:00:00 2001
From 9ba3389a4e980189ec76dcea48c7f03e2c5212a5 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 10 Jun 2017 20:56:02 +0100
Subject: [PATCH] Improve outdated build message
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index 4ba0ced5..a4fe8aad 100644
index 39fc55f9..c2512dd5 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -48,9 +48,9 @@ public class BungeeCordLauncher
@@ -53,9 +53,9 @@ public class BungeeCordLauncher
deadline.add( Calendar.WEEK_OF_YEAR, -8 );
if ( buildDate.before( deadline.getTime() ) )
{
@ -22,5 +22,5 @@ index 4ba0ced5..a4fe8aad 100644
Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
}
--
2.29.2
2.31.1.windows.1

View File

@ -1,4 +1,4 @@
From e11aadcf79d0e672de3681e1253977fedc327d0c Mon Sep 17 00:00:00 2001
From eb3467bf3d65ee24940d3ae3c4422ed16ba55544 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
@ -418,10 +418,10 @@ index 1f6ba085..617a077f 100644
pluginManager = new PluginManager( this );
getPluginManager().registerCommand( null, new CommandReload() );
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index a4fe8aad..e830198d 100644
index c2512dd5..0db3d76a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -63,6 +63,9 @@ public class BungeeCordLauncher
@@ -68,6 +68,9 @@ public class BungeeCordLauncher
if ( !options.has( "noconsole" ) )
{
@ -431,7 +431,7 @@ index a4fe8aad..e830198d 100644
String line;
while ( bungee.isRunning && ( line = bungee.getConsoleReader().readLine( ">" ) ) != null )
{
@@ -71,6 +74,8 @@ public class BungeeCordLauncher
@@ -76,6 +79,8 @@ public class BungeeCordLauncher
bungee.getConsole().sendMessage( new ComponentBuilder( "Command not found" ).color( ChatColor.RED ).create() );
}
}
@ -1585,5 +1585,5 @@ index 21a48df6..00000000
-
-}
--
2.25.1
2.31.1.windows.1

View File

@ -1,4 +1,4 @@
From b498c27f2197205ed7acb59939a6d1eeeef818e8 Mon Sep 17 00:00:00 2001
From e6d62e8999fba8fdb5409175d81238ddd383404b Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Wed, 22 Apr 2020 14:00:44 +1000
Subject: [PATCH] Add exception reporting event
@ -551,10 +551,10 @@ index 4180c995..90031156 100644
* Register a {@link Listener} for receiving called events. Methods in this
* Object which wish to receive events must be annotated with the
diff --git a/event/src/main/java/net/md_5/bungee/event/EventBus.java b/event/src/main/java/net/md_5/bungee/event/EventBus.java
index f5bd1f98..d7c3b90d 100644
index 8da5f275..d28fd528 100644
--- a/event/src/main/java/net/md_5/bungee/event/EventBus.java
+++ b/event/src/main/java/net/md_5/bungee/event/EventBus.java
@@ -33,7 +33,8 @@ public class EventBus
@@ -34,7 +34,8 @@ public class EventBus
this.logger = ( logger == null ) ? Logger.getLogger( Logger.GLOBAL_LOGGER_NAME ) : logger;
}
@ -564,7 +564,7 @@ index f5bd1f98..d7c3b90d 100644
{
EventHandlerMethod[] handlers = byEventBaked.get( event.getClass() );
@@ -52,7 +53,9 @@ public class EventBus
@@ -53,7 +54,9 @@ public class EventBus
throw new Error( "Method rejected target/argument: " + event, ex );
} catch ( InvocationTargetException ex )
{
@ -695,5 +695,5 @@ index 67db0cc4..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.31.1
2.31.1.windows.1

View File

@ -1,16 +1,16 @@
From 80403931ef95e1569b79c85d9b62a6485ef06ac3 Mon Sep 17 00:00:00 2001
From e12bc246dfc8d052e40895e3d6bf31d4fba2660d Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sat, 24 Apr 2021 17:52:33 +0100
Subject: [PATCH] Set Netty pooled buffer size to 4MB
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index e830198d..771b3725 100644
index 0db3d76a..35680528 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -21,6 +21,19 @@ public class BungeeCordLauncher
Security.setProperty( "networkaddress.cache.ttl", "30" );
Security.setProperty( "networkaddress.cache.negative.ttl", "10" );
@@ -26,6 +26,19 @@ public class BungeeCordLauncher
System.setProperty( "jdk.util.jar.enableMultiRelease", "force" );
}
+ // Waterfall start
+ // By default, Netty allocates 16MiB arenas for the PooledByteBufAllocator. This is too much
@ -29,5 +29,5 @@ index e830198d..771b3725 100644
parser.allowsUnrecognizedOptions();
parser.acceptsAll( Arrays.asList( "help" ), "Show the help" );
--
2.31.1
2.31.1.windows.1