Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-03-02 10:41:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-07-09 10:12:55 +01:00
parent 3d3ab27dcf
commit a40c225a66
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
12 changed files with 50 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 730715e68b7a6fe4b64e3b7a9b3b166d35f30abe
Subproject commit fa542c70df4c797be510bfd36327181348f0f2bf

10
BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,4 +1,4 @@
From 3dbc0055fbf1e0ea2fbfc5118e8befded266a048 Mon Sep 17 00:00:00 2001
From a88a7732ffba82dc21753d5cad9f5f1578f7c76e 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
@ -53,10 +53,10 @@ index 9d51608d..446dfe2f 100644
while ( bungee.isRunning )
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 5ca4fe8a..90af65fa 100644
index 2555348f..48194798 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -188,7 +188,7 @@ public class BungeeCord extends ProxyServer
@@ -182,7 +182,7 @@ public class BungeeCord extends ProxyServer
public BungeeCord() throws IOException
{
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@ -65,7 +65,7 @@ index 5ca4fe8a..90af65fa 100644
System.setSecurityManager( new BungeeSecurityManager() );
@@ -483,7 +483,7 @@ public class BungeeCord extends ProxyServer
@@ -488,7 +488,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -114,5 +114,5 @@ index 408312fd..95590b6d 100644
InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.17.1
2.16.1

8
BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
View File

@ -1,4 +1,4 @@
From e900c3b4c484292f81e4ab1e34e7fac515f98a80 Mon Sep 17 00:00:00 2001
From 49fc7e69aa3d6f00a7ba5fd920b05dbcba2b7cfb Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Configurable Waterfall Metrics
@ -46,10 +46,10 @@ index f9e277dc..056b8040 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 0a555864..eb816dce 100644
index fca210cd..174a0d18 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -298,7 +298,9 @@ public class BungeeCord extends ProxyServer
@@ -299,7 +299,9 @@ public class BungeeCord extends ProxyServer
}
}
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -82,5 +82,5 @@ index 95239878..e482e98c 100644
// Connect to the website
URLConnection connection;
--
2.17.1
2.16.1

6
BungeeCord-Patches/0006-Get-rid-of-the-security-manager.patch
View File

@ -1,4 +1,4 @@
From a4631983a6b2ef04c689ee10f1e9c3940f285d5d Mon Sep 17 00:00:00 2001
From ee84eda36902629e0e7340d0088f80c7c13b888b Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Mon, 25 Jan 2016 01:19:07 -0500
Subject: [PATCH] Get rid of the security manager.
@ -6,10 +6,10 @@ Subject: [PATCH] Get rid of the security manager.
There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 179e3a3a..c93607fd 100644
index 174a0d18..6a4cc14c 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -191,8 +191,6 @@ public class BungeeCord extends ProxyServer
@@ -185,8 +185,6 @@ public class BungeeCord extends ProxyServer
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );

8
BungeeCord-Patches/0013-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch
View File

@ -1,14 +1,14 @@
From b0f49e80108cc2df98f65dc8b19b78305b551c85 Mon Sep 17 00:00:00 2001
From 21915cbd51f2633b3b71c3e784f634d04fd2c081 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@optic.tv>
Date: Mon, 6 Jul 2015 18:59:29 -0500
Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 451a93d0..bb162e0f 100644
index 6a4cc14c..b9cf1ee2 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -328,6 +328,8 @@ public class BungeeCord extends ProxyServer
@@ -329,6 +329,8 @@ public class BungeeCord extends ProxyServer
new ServerBootstrap()
.channel( PipelineUtils.getServerChannel() )
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
@ -18,5 +18,5 @@ index 451a93d0..bb162e0f 100644
.childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops )
--
2.17.1
2.16.1

10
BungeeCord-Patches/0016-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From 7320250bed10e66cd09a696a6c6f482bee2f5160 Mon Sep 17 00:00:00 2001
From 9553db26ff87855c70317e4ca59f4d5213fb13ae Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -10,7 +10,7 @@ Subject: [PATCH] Micro-optimizations
- Optimise replacing dashes in UUID's
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index 71a5a158..520ee315 100644
index 096538a7..54a65155 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -42,7 +42,6 @@ import org.yaml.snakeyaml.introspector.PropertyUtils;
@ -31,10 +31,10 @@ index 71a5a158..520ee315 100644
if ( split.length == 0 )
{
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index bb162e0f..09652575 100644
index b9cf1ee2..fcdc8967 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -516,7 +516,9 @@ public class BungeeCord extends ProxyServer
@@ -521,7 +521,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>";
try
{
@ -79,5 +79,5 @@ index 9ea61319..565e6b0e 100644
String subChannel = in.readUTF();
--
2.17.1
2.16.1

14
BungeeCord-Patches/0023-Use-a-worker-and-a-boss-event-loop-group.patch
View File

@ -1,4 +1,4 @@
From 80ee547ecc6cbbb97d20096758ba66f39ed19aef Mon Sep 17 00:00:00 2001
From 0449711c6f75a43eac964254b8e8fa6cab2d3bc9 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 09652575..29b3ff11 100644
index fcdc8967..14555472 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
@ -20,7 +20,7 @@ index 09652575..29b3ff11 100644
/**
* locations.yml save thread.
*/
@@ -254,7 +254,8 @@ public class BungeeCord extends ProxyServer
@@ -255,7 +255,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
}
@ -30,7 +30,7 @@ index 09652575..29b3ff11 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -332,7 +333,7 @@ public class BungeeCord extends ProxyServer
@@ -333,7 +334,7 @@ public class BungeeCord extends ProxyServer
.childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index 09652575..29b3ff11 100644
.localAddress( info.getHost() )
.bind().addListener( listener );
@@ -353,7 +354,7 @@ public class BungeeCord extends ProxyServer
@@ -354,7 +355,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index 09652575..29b3ff11 100644
}
}
}
@@ -444,12 +445,14 @@ public class BungeeCord extends ProxyServer
@@ -449,12 +450,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
@ -83,5 +83,5 @@ index 9756c09c..648cd273 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
.remoteAddress( getAddress() )
--
2.17.1
2.16.1

10
BungeeCord-Patches/0028-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From cd8c407ecee53a9083006fbd23882cf05df05091 Mon Sep 17 00:00:00 2001
From 554c73d20389ff56690fcb82bf8eb5f00ba78d5d Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -96,7 +96,7 @@ index 5a49050a..f04e2bf4 100644
* Does the server authenticate with mojang
*/
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
index 11c5b685..1c011d08 100644
index ccc8153f..1351941a 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
@@ -93,9 +93,25 @@ public abstract class ProxyServer
@ -157,10 +157,10 @@ index 416c54e3..920b9b36 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase();
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 29b3ff11..b6f0e459 100644
index 14555472..af84795f 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -592,10 +592,18 @@ public class BungeeCord extends ProxyServer
@@ -597,10 +597,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}
@ -298,5 +298,5 @@ index 3a73a870..d3f0b2d8 100644
+ // Waterfall end
}
--
2.17.1
2.16.1

8
BungeeCord-Patches/0031-Configurable-server-version-in-ping-response.patch
View File

@ -1,4 +1,4 @@
From 9a18f1dc563de271ce89c5fd79d1a70781354e4a Mon Sep 17 00:00:00 2001
From 16f5603904b7ec61c3982d44b08f2a9e0541f81e Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response
@ -59,10 +59,10 @@ index 68f25460..59835815 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index b6f0e459..788e6687 100644
index af84795f..6ddb2cb7 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -641,7 +641,7 @@ public class BungeeCord extends ProxyServer
@@ -646,7 +646,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{
@ -72,5 +72,5 @@ index b6f0e459..788e6687 100644
@Override
--
2.17.1
2.16.1

14
BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 74f56e5352407993754cacb27f81948908e5fba3 Mon Sep 17 00:00:00 2001
From 838c64762f41da5e8e81fe8cb973edc24a19b2db Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -395,7 +395,7 @@ index 00000000..6cfe283a
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 788e6687..bba7a0e7 100644
index 6ddb2cb7..22ebfe44 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -442,7 +442,7 @@ index 788e6687..bba7a0e7 100644
@Getter
private final Logger logger;
public final Gson gson = new GsonBuilder()
@@ -200,6 +199,8 @@ public class BungeeCord extends ProxyServer
@@ -194,6 +193,8 @@ public class BungeeCord extends ProxyServer
}
reloadMessages();
@ -451,7 +451,7 @@ index 788e6687..bba7a0e7 100644
// This is a workaround for quite possibly the weirdest bug I have ever encountered in my life!
// When jansi attempts to extract its natives, by default it tries to extract a specific version,
// using the loading class's implementation version. Normally this works completely fine,
@@ -218,6 +219,9 @@ public class BungeeCord extends ProxyServer
@@ -212,6 +213,9 @@ public class BungeeCord extends ProxyServer
logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
@ -459,8 +459,8 @@ index 788e6687..bba7a0e7 100644
+ logger = io.github.waterfallmc.waterfall.log4j.WaterfallLogger.create();
+ // Waterfall end
if ( !Boolean.getBoolean( "net.md_5.bungee.native.disable" ) )
{
pluginManager = new PluginManager( this );
getPluginManager().registerCommand( null, new CommandReload() );
diff --git a/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandCompleter.java b/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandCompleter.java
deleted file mode 100644
index bd52d880..00000000
@ -506,5 +506,5 @@ index 10366c88..8c5cc949 100644
}
--
2.18.0
2.16.1

10
BungeeCord-Patches/0047-Forge-is-a-first-class-citizen.patch
View File

@ -1,18 +1,18 @@
From 13717faeafe2c5c4fe644eb9c4e6b041b4b324b1 Mon Sep 17 00:00:00 2001
From 11d2b646be887ba892480c2d92a704f9fe484892 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index bba7a0e7..d5b3bd3d 100644
index 22ebfe44..43c6e24a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -276,8 +276,6 @@ public class BungeeCord extends ProxyServer
@@ -277,8 +277,6 @@ public class BungeeCord extends ProxyServer
registerChannel( ForgeConstants.FML_TAG );
registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
registerChannel( ForgeConstants.FORGE_REGISTER );
-
-
- getLogger().warning( "MinecraftForge support is currently unmaintained and may have unresolved issues. Please use at your own risk." );
}
@ -31,5 +31,5 @@ index d3f0b2d8..242535d0 100644
@Synchronized("serversLock") // Waterfall
public void load()
--
2.17.1
2.16.1

26
BungeeCord-Patches/0048-Avoid-stopping-if-already-in-progress.patch
View File

@ -1,26 +0,0 @@
From 26db2fb70aef93e407e58be44bca22e691ba44d1 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 6 Jul 2018 23:15:21 +0200
Subject: [PATCH] Avoid stopping if already in progress
Currently it is possible to stop the proxy multiple times, causing
the shutdown routines to be called twice. This doesn't make any
sense and may even cause problems with some plugins.
Cancel early if stopping is already in progress to avoid this.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index d5b3bd3d..ae7297f5 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -386,6 +386,7 @@ public class BungeeCord extends ProxyServer
@Override
public void stop(final String reason)
{
+ if (!this.isRunning) return; // Waterfall - Avoid stopping if already in progress
new Thread( "Shutdown Thread" )
{
@Override
--
2.18.0