Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-06-26 14:35:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-04-26 17:32:42 +01:00
parent 6cd013ce1d
commit bfb622eb23
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
11 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 53cc3242e1d2786c34b2e138d233c4eeca8e3b1d
Subproject commit bfab8a1d9c757d8e5f414ead5e0a5cf8d3df5815

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

@ -1,4 +1,4 @@
From a82fa6af350ae6373c36f1327adb7a929af5b87d Mon Sep 17 00:00:00 2001
From 70bc204b8f48aaec90fb5561ec9cf7ba646018d0 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 9fdb4c76..2fd36e8f 100644
index f31faa99..259c20fc 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -177,7 +177,7 @@ public class BungeeCord extends ProxyServer
@@ -178,7 +178,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 9fdb4c76..2fd36e8f 100644
System.setSecurityManager( new BungeeSecurityManager() );
@@ -469,7 +469,7 @@ public class BungeeCord extends ProxyServer
@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -114,5 +114,5 @@ index c7547c7f..82ff91ae 100644
InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.11.0
2.12.0

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

@ -1,11 +1,11 @@
From 4eb927bb9546be184307fdeb39b011e07975c96d Mon Sep 17 00:00:00 2001
From 6ca6da8d88b2bce759145bb60b11ecb045aa1863 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
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 b30541b..293ec4e 100644
index b30541be..293ec4e3 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
@@ -84,4 +84,8 @@ public interface ProxyConfig
@ -18,7 +18,7 @@ index b30541b..293ec4e 100644
+ boolean isMetrics();
}
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 f9e277d..056b804 100644
index f9e277dc..056b8040 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
@@ -9,10 +9,23 @@ import net.md_5.bungee.conf.YamlConfig;
@ -46,10 +46,10 @@ index f9e277d..056b804 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 7bb0862..a7dcc97 100644
index 7eaf7fb5..1582cf52 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -289,7 +289,9 @@ public class BungeeCord extends ProxyServer
@@ -290,7 +290,9 @@ public class BungeeCord extends ProxyServer
}
}
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -61,7 +61,7 @@ index 7bb0862..a7dcc97 100644
public void startListeners()
diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
index 9523987..e482e98 100644
index 95239878..e482e98c 100644
--- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
+++ b/proxy/src/main/java/net/md_5/bungee/Metrics.java
@@ -9,6 +9,7 @@ import java.net.URL;
@ -82,5 +82,5 @@ index 9523987..e482e98 100644
// Connect to the website
URLConnection connection;
--
2.10.0
2.12.0

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

@ -1,4 +1,4 @@
From a7ac451c1b8866263a0ff6eda54ec547377eed07 Mon Sep 17 00:00:00 2001
From cd5bcb84aa20c6405a4b434c046af687f129286f 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 290fad4..bd81d66 100644
index 1582cf52..fbec9e86 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -180,8 +180,6 @@ public class BungeeCord extends ProxyServer
@@ -181,8 +181,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." );
@ -20,7 +20,7 @@ index 290fad4..bd81d66 100644
baseBundle = ResourceBundle.getBundle( "messages" );
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeSecurityManager.java b/proxy/src/main/java/net/md_5/bungee/BungeeSecurityManager.java
deleted file mode 100644
index 53c8192..0000000
index 53c81923..00000000
--- a/proxy/src/main/java/net/md_5/bungee/BungeeSecurityManager.java
+++ /dev/null
@@ -1,78 +0,0 @@
@ -103,5 +103,5 @@ index 53c8192..0000000
- }
-}
--
2.10.0
2.12.0

8
BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch
View File

@ -1,14 +1,14 @@
From ebc0dcc10f56b2c1f3b26535702849f94b4ec3e6 Mon Sep 17 00:00:00 2001
From 14a65cdadacf3f26e2d8e0bd38b5aa6b431de19e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Sep 2015 23:50:52 -0400
Subject: [PATCH] Allow configuration of the log file path/filename
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 bd81d66..a3c8caf 100644
index fbec9e86..9b07c805 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -210,7 +210,7 @@ public class BungeeCord extends ProxyServer
@@ -211,7 +211,7 @@ public class BungeeCord extends ProxyServer
consoleReader = new ConsoleReader();
consoleReader.setExpandEvents( false );
@ -18,5 +18,5 @@ index bd81d66..a3c8caf 100644
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
--
2.10.0
2.12.0

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

@ -1,14 +1,14 @@
From 344cc3d7f77465bc3ec499fd950f5afc6024aba7 Mon Sep 17 00:00:00 2001
From f64081bf3f96b461e7ca9190fa2f2be8dd093eaa 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 a3c8caf..64a0dc5 100644
index 9b07c805..39ef4882 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -314,6 +314,8 @@ public class BungeeCord extends ProxyServer
@@ -315,6 +315,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 a3c8caf..64a0dc5 100644
.childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops )
--
2.10.0
2.12.0

8
BungeeCord-Patches/0017-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From 4b5a5536a11e57f0153f1b6d4178da506552b5e2 Mon Sep 17 00:00:00 2001
From eb365e4eb92512df20c033527375a744d8722042 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:05:33 -0600
Subject: [PATCH] Micro-optimizations
@ -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 71de54ef..745f0428 100644
index 39ef4882..eb3f9973 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -487,7 +487,9 @@ public class BungeeCord extends ProxyServer
@@ -488,7 +488,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>";
try
{
@ -79,5 +79,5 @@ index c0a5061a..ce32f6b1 100644
String subChannel = in.readUTF();
--
2.11.0
2.12.0

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

@ -1,4 +1,4 @@
From 036ded4348c14c4dd437ed4725fe3243862d20c8 Mon Sep 17 00:00:00 2001
From 5f631f797f46a5f9d327f3f8f593dbfc84cdf936 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 745f0428..a90beaf7 100644
index eb3f9973..9d7a25ab 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -110,7 +110,7 @@ public class BungeeCord extends ProxyServer
@ -20,7 +20,7 @@ index 745f0428..a90beaf7 100644
/**
* locations.yml save thread.
*/
@@ -250,7 +250,8 @@ public class BungeeCord extends ProxyServer
@@ -251,7 +251,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
}
@ -30,7 +30,7 @@ index 745f0428..a90beaf7 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -318,7 +319,7 @@ public class BungeeCord extends ProxyServer
@@ -319,7 +320,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 745f0428..a90beaf7 100644
.localAddress( info.getHost() )
.bind().addListener( listener );
@@ -339,7 +340,7 @@ public class BungeeCord extends ProxyServer
@@ -340,7 +341,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index 745f0428..a90beaf7 100644
}
}
}
@@ -402,12 +403,14 @@ public class BungeeCord extends ProxyServer
@@ -403,12 +404,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
@ -83,5 +83,5 @@ index bc56d4f3..efcba311 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
.remoteAddress( getAddress() )
--
2.11.0
2.12.0

10
BungeeCord-Patches/0031-Allow-the-console-to-tab-complete-commands.patch
View File

@ -1,14 +1,14 @@
From a76d79a2bea4d4a3296fde3fa3b484d8ddd1446d Mon Sep 17 00:00:00 2001
From 1ec9c98ab715ee1884239da6c0e3b4957235ed46 Mon Sep 17 00:00:00 2001
From: Mystiflow <mystiflow@gmail.com>
Date: Sun, 14 Feb 2016 15:54:40 +0000
Subject: [PATCH] Allow the console to tab complete commands
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 12c7cc1..60a0cb4 100644
index 9d7a25ab..8a4b2283 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -209,6 +209,7 @@ public class BungeeCord extends ProxyServer
@@ -210,6 +210,7 @@ public class BungeeCord extends ProxyServer
AnsiConsole.systemInstall();
consoleReader = new ConsoleReader();
consoleReader.setExpandEvents( false );
@ -18,7 +18,7 @@ index 12c7cc1..60a0cb4 100644
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/ConsoleCommandCompleter.java b/proxy/src/main/java/net/md_5/bungee/ConsoleCommandCompleter.java
new file mode 100644
index 0000000..455b078
index 00000000..455b0787
--- /dev/null
+++ b/proxy/src/main/java/net/md_5/bungee/ConsoleCommandCompleter.java
@@ -0,0 +1,72 @@
@ -95,5 +95,5 @@ index 0000000..455b078
+ }
+}
--
2.10.0
2.12.0

8
BungeeCord-Patches/0032-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 084d0ab4686c9a754034d2aeb7aea7098647107d Mon Sep 17 00:00:00 2001
From 9cb84743b549d8586a3ce7c762e06b1c8e84df34 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.
@ -144,10 +144,10 @@ index 967a1b2a..08aa6981 100644
{
int index = path.indexOf( SEPARATOR );
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 520377cc..9c5bccb0 100644
index 8a4b2283..95750d44 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -572,10 +572,18 @@ public class BungeeCord extends ProxyServer
@@ -565,10 +565,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}
@ -285,5 +285,5 @@ index db9ebbdd..4d16fa3a 100644
+ // Waterfall end
}
--
2.11.0
2.12.0

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

@ -1,4 +1,4 @@
From d8090cf8f33c6710061d3371372ba36e4b91f6b0 Mon Sep 17 00:00:00 2001
From 4e1eef7d9dc4eb9441c30a7f35e9aa4d5425b52e 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 9c5bccb0..a6fd37a8 100644
index 95750d44..59d55fc0 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -621,7 +621,7 @@ public class BungeeCord extends ProxyServer
@@ -614,7 +614,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{
@ -72,5 +72,5 @@ index 9c5bccb0..a6fd37a8 100644
@Override
--
2.11.0
2.12.0