Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-24 19:25:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-02-20 13:20:51 +00:00
parent 4c55f25c9c
commit 19d850ebb1
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
15 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit e23195f5f2179b6372052f4dc9ea996b90163cf1 Subproject commit a3b44aa612c629955195b4697641de1b1665a587

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

@ -1,4 +1,4 @@
From 7b85684874255cae79234bec39f375ea3f5e57d3 Mon Sep 17 00:00:00 2001 From 207551ef6b7e99e5f4844b9e7fb8c693b925d85c Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700 Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall Subject: [PATCH] Rename references from BungeeCord to Waterfall
@ -53,10 +53,10 @@ index 9d51608d..446dfe2f 100644
while ( bungee.isRunning ) 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 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 2b6c6995..f90bc370 100644 index 5405a537..0d41645b 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -179,7 +179,7 @@ public class BungeeCord extends ProxyServer @@ -188,7 +188,7 @@ public class BungeeCord extends ProxyServer
public BungeeCord() throws IOException 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. // 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 2b6c6995..f90bc370 100644
System.setSecurityManager( new BungeeSecurityManager() ); System.setSecurityManager( new BungeeSecurityManager() );
@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer @@ -479,7 +479,7 @@ public class BungeeCord extends ProxyServer
@Override @Override
public String getName() public String getName()
{ {
@ -114,5 +114,5 @@ index 408312fd..95590b6d 100644
InetSocketAddress address = Util.getAddr( addr ); InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
-- --
2.14.3 2.16.1

8
BungeeCord-Patches/0003-Add-Waterfall-configuration-files.patch
View File

@ -1,4 +1,4 @@
From 8bcbac6bb22e605d7e9bb751c74ba1ac2bef3373 Mon Sep 17 00:00:00 2001 From 89660a3a2bdcfc95468d053c89a620dbd0626bed Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400 Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files Subject: [PATCH] Add Waterfall configuration files
@ -43,7 +43,7 @@ index 00000000..f9e277dc
+ } + }
+} +}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 f90bc370..06ceabb9 100644 index 0d41645b..1144ec73 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -11,6 +11,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -11,6 +11,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -54,7 +54,7 @@ index f90bc370..06ceabb9 100644
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelException; import io.netty.channel.ChannelException;
@@ -104,7 +105,7 @@ public class BungeeCord extends ProxyServer @@ -110,7 +111,7 @@ public class BungeeCord extends ProxyServer
* Configuration. * Configuration.
*/ */
@Getter @Getter
@ -119,5 +119,5 @@ index 95590b6d..1019c307 100644
if ( permissions.isEmpty() ) if ( permissions.isEmpty() )
{ {
-- --
2.14.3 2.16.1

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

@ -1,4 +1,4 @@
From f3583f4a0d45342a59b462af34d68c93705ba8b3 Mon Sep 17 00:00:00 2001 From deab52d855171f7f411835d801e6edc3ef5f343a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 10:55:20 -0700 Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Configurable Waterfall Metrics 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 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 06ceabb9..87b17dc8 100644 index 1144ec73..179e3a3a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -285,7 +285,9 @@ public class BungeeCord extends ProxyServer @@ -294,7 +294,9 @@ public class BungeeCord extends ProxyServer
} }
} }
}, 0, TimeUnit.MINUTES.toMillis( 5 ) ); }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -82,5 +82,5 @@ index 95239878..e482e98c 100644
// Connect to the website // Connect to the website
URLConnection connection; URLConnection connection;
-- --
2.14.3 2.16.1

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

@ -1,4 +1,4 @@
From 7829dc4e89c46d4c1e65ba0980ba2546b75ec74a Mon Sep 17 00:00:00 2001 From a4631983a6b2ef04c689ee10f1e9c3940f285d5d Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Mon, 25 Jan 2016 01:19:07 -0500 Date: Mon, 25 Jan 2016 01:19:07 -0500
Subject: [PATCH] Get rid of the security manager. 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. 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 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 87b17dc8..a00e688d 100644 index 179e3a3a..c93607fd 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -182,8 +182,6 @@ public class BungeeCord extends ProxyServer @@ -191,8 +191,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. // 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." ); Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
@ -103,5 +103,5 @@ index 53c81923..00000000
- } - }
-} -}
-- --
2.14.3 2.16.1

8
BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From 81d0178ac2014c4289c0511cd919afc02d9bfe85 Mon Sep 17 00:00:00 2001 From 1424553c4cbf124a575ada58158b2bbdd6342572 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk> From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400 Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -67,10 +67,10 @@ index 4a96a601..61c53b30 100644
} }
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 4c828815..37479be3 100644 index 67adfef9..48f2aa8e 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer @@ -165,8 +165,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this ); forgeClientHandler = new ForgeClientHandler( this );
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token. * The FML 1.8 handshake token.
*/ */
-- --
2.14.3 2.16.1

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

@ -1,14 +1,14 @@
From e630a01ad55d08e6d09d9eea39c21cb2c08356d2 Mon Sep 17 00:00:00 2001 From cb100cb895b975df9aac238f2739022e4de43079 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@optic.tv> From: Iceee <andrew@optic.tv>
Date: Mon, 6 Jul 2015 18:59:29 -0500 Date: Mon, 6 Jul 2015 18:59:29 -0500
Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit 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 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 a00e688d..6f1c3f68 100644 index c93607fd..507db01f 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -315,6 +315,8 @@ public class BungeeCord extends ProxyServer @@ -324,6 +324,8 @@ public class BungeeCord extends ProxyServer
new ServerBootstrap() new ServerBootstrap()
.channel( PipelineUtils.getServerChannel() ) .channel( PipelineUtils.getServerChannel() )
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere! .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
@ -18,5 +18,5 @@ index a00e688d..6f1c3f68 100644
.childHandler( PipelineUtils.SERVER_CHILD ) .childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops ) .group( eventLoops )
-- --
2.14.3 2.16.1

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

@ -1,4 +1,4 @@
From 3b533fd77d76327101248aeb4bb6ccf4929dcb65 Mon Sep 17 00:00:00 2001 From c001ff289470f54a0c30524af6df8c6be00c62fc Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:05:33 -0600 Date: Thu, 19 May 2016 18:05:33 -0600
Subject: [PATCH] Micro-optimizations Subject: [PATCH] Micro-optimizations
@ -31,10 +31,10 @@ index 71a5a158..520ee315 100644
if ( split.length == 0 ) 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 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 6f1c3f68..7876f10a 100644 index 507db01f..fde98e27 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -503,7 +503,9 @@ public class BungeeCord extends ProxyServer @@ -512,7 +512,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>"; String translation = "<translation '" + name + "' missing>";
try try
{ {
@ -46,10 +46,10 @@ index 6f1c3f68..7876f10a 100644
{ {
} }
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 37479be3..d1ec66c1 100644 index 48f2aa8e..d9810c63 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -532,7 +532,7 @@ public final class UserConnection implements ProxiedPlayer @@ -538,7 +538,7 @@ public final class UserConnection implements ProxiedPlayer
@Override @Override
public Locale getLocale() public Locale getLocale()
{ {
@ -79,5 +79,5 @@ index 95b547b3..5829dda9 100644
String subChannel = in.readUTF(); String subChannel = in.readUTF();
-- --
2.14.3 2.16.1

6
BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From 4911849bf46ae1005c2c9efbf0de31ef2a6869d0 Mon Sep 17 00:00:00 2001 From 71374ababcec369da8b75d493e708767dbbef271 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600 Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers Subject: [PATCH] Allow invalid packet ids for forge servers
@ -93,10 +93,10 @@ index 61c53b30..b29ee7c5 100644
ch.write( BungeeCord.getInstance().registerChannels() ); ch.write( BungeeCord.getInstance().registerChannels() );
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index d1ec66c1..158dfb18 100644 index d9810c63..5468144a 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -70,6 +70,7 @@ public final class UserConnection implements ProxiedPlayer @@ -71,6 +71,7 @@ public final class UserConnection implements ProxiedPlayer
@NonNull @NonNull
private final ProxyServer bungee; private final ProxyServer bungee;
@NonNull @NonNull

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

@ -1,4 +1,4 @@
From f6c7a13ff0fc4cfcb825e54d82e9f9f0385c7fe9 Mon Sep 17 00:00:00 2001 From 54a03d0d14c69cdc40bbf9e07a75643f0725864a Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com> From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700 Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group. Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,10 +8,10 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty. 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 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 7876f10a..0903dc5f 100644 index fde98e27..40f28a12 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -111,7 +111,7 @@ public class BungeeCord extends ProxyServer @@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
*/ */
private ResourceBundle baseBundle; private ResourceBundle baseBundle;
private ResourceBundle customBundle; private ResourceBundle customBundle;
@ -20,7 +20,7 @@ index 7876f10a..0903dc5f 100644
/** /**
* locations.yml save thread. * locations.yml save thread.
*/ */
@@ -246,7 +246,8 @@ public class BungeeCord extends ProxyServer @@ -255,7 +255,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
} }
@ -30,7 +30,7 @@ index 7876f10a..0903dc5f 100644
File moduleDirectory = new File( "modules" ); File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory ); moduleManager.load( this, moduleDirectory );
@@ -319,7 +320,7 @@ public class BungeeCord extends ProxyServer @@ -328,7 +329,7 @@ public class BungeeCord extends ProxyServer
.childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 ) .childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
.childAttr( PipelineUtils.LISTENER, info ) .childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD ) .childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index 7876f10a..0903dc5f 100644
.localAddress( info.getHost() ) .localAddress( info.getHost() )
.bind().addListener( listener ); .bind().addListener( listener );
@@ -340,7 +341,7 @@ public class BungeeCord extends ProxyServer @@ -349,7 +350,7 @@ public class BungeeCord extends ProxyServer
} }
} }
}; };
@ -48,7 +48,7 @@ index 7876f10a..0903dc5f 100644
} }
} }
} }
@@ -431,12 +432,14 @@ public class BungeeCord extends ProxyServer @@ -440,12 +441,14 @@ public class BungeeCord extends ProxyServer
} }
getLogger().info( "Closing IO threads" ); getLogger().info( "Closing IO threads" );
@ -83,5 +83,5 @@ index 9756c09c..648cd273 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
.remoteAddress( getAddress() ) .remoteAddress( getAddress() )
-- --
2.14.3 2.16.1

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

@ -1,4 +1,4 @@
From 5e5fd31270af1cc6ef58f58f65688637a3d37a1d Mon Sep 17 00:00:00 2001 From 0a3a3e40c649e188cf4aa5ff1d1fbcc028df9ab5 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200 Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api. Subject: [PATCH] Add dynamic server addition/removal api.
@ -126,7 +126,7 @@ index 11c5b685..1c011d08 100644
* Gets the server info of a server. * Gets the server info of a server.
* *
diff --git a/config/src/main/java/net/md_5/bungee/config/Configuration.java b/config/src/main/java/net/md_5/bungee/config/Configuration.java diff --git a/config/src/main/java/net/md_5/bungee/config/Configuration.java b/config/src/main/java/net/md_5/bungee/config/Configuration.java
index 967a1b2a..08aa6981 100644 index 262b29c8..d7ed3e11 100644
--- a/config/src/main/java/net/md_5/bungee/config/Configuration.java --- a/config/src/main/java/net/md_5/bungee/config/Configuration.java
+++ b/config/src/main/java/net/md_5/bungee/config/Configuration.java +++ b/config/src/main/java/net/md_5/bungee/config/Configuration.java
@@ -44,6 +44,13 @@ public final class Configuration @@ -44,6 +44,13 @@ public final class Configuration
@ -157,10 +157,10 @@ index b3ff750f..43d11cf2 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase(); 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 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 0903dc5f..1807b67a 100644 index 40f28a12..f14821b4 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -579,10 +579,18 @@ public class BungeeCord extends ProxyServer @@ -588,10 +588,18 @@ public class BungeeCord extends ProxyServer
return config.getServers(); return config.getServers();
} }
@ -298,5 +298,5 @@ index d131c02c..a755121a 100644
+ // Waterfall end + // Waterfall end
} }
-- --
2.14.3 2.16.1

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

@ -1,4 +1,4 @@
From 7782b26a7752100381fe77f3f5c05241e111c237 Mon Sep 17 00:00:00 2001 From ff7fc3cfd40c91a22308b2852a9b41b2cf2c1ff3 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500 Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response Subject: [PATCH] Configurable server version in ping response
@ -59,10 +59,10 @@ index 68f25460..59835815 100644
@Override @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 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 1807b67a..c84389cd 100644 index f14821b4..064a7672 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -628,7 +628,7 @@ public class BungeeCord extends ProxyServer @@ -637,7 +637,7 @@ public class BungeeCord extends ProxyServer
@Override @Override
public String getGameVersion() public String getGameVersion()
{ {
@ -72,5 +72,5 @@ index 1807b67a..c84389cd 100644
@Override @Override
-- --
2.14.3 2.16.1

16
BungeeCord-Patches/0032-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From 8adb1e83be972c4c99dd476f8b5ffc5c8911ab11 Mon Sep 17 00:00:00 2001 From f82be462da498b66febd16be3ffee08ac55fee95 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io> From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400 Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods Subject: [PATCH] Add timeout variant to connect methods
@ -6,10 +6,10 @@ Subject: [PATCH] Add timeout variant to connect methods
Also added more connect methods to ProxiedPlayer, in addition to the new method Also added more connect methods to ProxiedPlayer, in addition to the new method
diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
index 16cfff8b..98754bdf 100644 index 2bb92a93..23658cf9 100644
--- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
+++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
@@ -98,6 +98,38 @@ public interface ProxiedPlayer extends Connection, CommandSender @@ -99,6 +99,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
*/ */
void connect(ServerInfo target, Callback<Boolean> callback); void connect(ServerInfo target, Callback<Boolean> callback);
@ -49,10 +49,10 @@ index 16cfff8b..98754bdf 100644
* Gets the server this player is connected to. * Gets the server this player is connected to.
* *
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 158dfb18..e9da4202 100644 index 5468144a..eee311df 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -232,6 +232,12 @@ public final class UserConnection implements ProxiedPlayer @@ -233,6 +233,12 @@ public final class UserConnection implements ProxiedPlayer
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry) public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry)
{ {
@ -65,7 +65,7 @@ index 158dfb18..e9da4202 100644
Preconditions.checkNotNull( info, "info" ); Preconditions.checkNotNull( info, "info" );
ServerConnectEvent event = new ServerConnectEvent( this, info ); ServerConnectEvent event = new ServerConnectEvent( this, info );
@@ -305,7 +311,7 @@ public final class UserConnection implements ProxiedPlayer @@ -306,7 +312,7 @@ public final class UserConnection implements ProxiedPlayer
if ( retry && def != null && ( getServer() == null || def != getServer().getInfo() ) ) if ( retry && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{ {
sendMessage( bungee.getTranslation( "fallback_lobby" ) ); sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@ -74,7 +74,7 @@ index 158dfb18..e9da4202 100644
} else if ( dimensionChange ) } else if ( dimensionChange )
{ {
disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) ); disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
@@ -320,7 +326,7 @@ public final class UserConnection implements ProxiedPlayer @@ -321,7 +327,7 @@ public final class UserConnection implements ProxiedPlayer
.channel( PipelineUtils.getChannel() ) .channel( PipelineUtils.getChannel() )
.group( ch.getHandle().eventLoop() ) .group( ch.getHandle().eventLoop() )
.handler( initializer ) .handler( initializer )
@ -84,5 +84,5 @@ index 158dfb18..e9da4202 100644
// Windows is bugged, multi homed users will just have to live with random connecting IPs // Windows is bugged, multi homed users will just have to live with random connecting IPs
if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() ) if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() )
-- --
2.14.3 2.16.1

12
BungeeCord-Patches/0035-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From 383d5fbd50068ab7f5c76cb2f52ba827a44dd395 Mon Sep 17 00:00:00 2001 From bc0316ea4c7f910c13c24922686f5631555ad4bb Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com> From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200 Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -32,7 +32,7 @@ index 6f782c8f..2d5fc487 100644
+ // Waterfall end + // Waterfall end
} }
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 7ff5411b..fb2fea87 100644 index a568d472..97aacd00 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat; @@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
@ -163,7 +163,7 @@ index 00000000..7ed2dc3a
+ } + }
+} +}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 055a886d..af393836 100644 index eee311df..520b42c8 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -2,7 +2,9 @@ package net.md_5.bungee; @@ -2,7 +2,9 @@ package net.md_5.bungee;
@ -176,7 +176,7 @@ index 055a886d..af393836 100644
import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer @@ -126,6 +128,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard(); private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter @Getter
private final Collection<UUID> sentBossBars = new HashSet<>(); private final Collection<UUID> sentBossBars = new HashSet<>();
@ -188,7 +188,7 @@ index 055a886d..af393836 100644
@Getter @Getter
private String displayName; private String displayName;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index de905b83..92fe918b 100644 index 9b21b05d..201b6c3e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -31,6 +31,8 @@ import net.md_5.bungee.netty.PacketHandler; @@ -31,6 +31,8 @@ import net.md_5.bungee.netty.PacketHandler;
@ -271,5 +271,5 @@ index 673497e5..17e250d4 100644
* Sends the server mod list to the client, or stores it for sending later. * Sends the server mod list to the client, or stores it for sending later.
* *
-- --
2.14.1 2.16.1

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

@ -1,4 +1,4 @@
From 27e23e906fd1a377fb74fe8797664333eddcf16c Mon Sep 17 00:00:00 2001 From bf6eabd5788f7eb3323671a14145b160d80fc8ce Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net> From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200 Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -249,7 +249,7 @@ index 00000000..d4a81199
+ </Loggers> + </Loggers>
+</Configuration> +</Configuration>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 6b4c1606..b82ef30a 100644 index c3cd07bf..b11f8a86 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
@ -395,7 +395,7 @@ index 00000000..a8a94749
+ +
+} +}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 c84389cd..08699416 100644 index 064a7672..953f9085 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/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; @@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -406,7 +406,7 @@ index c84389cd..08699416 100644
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.Synchronized; import lombok.Synchronized;
@@ -72,14 +71,11 @@ import net.md_5.bungee.command.CommandEnd; @@ -78,14 +77,11 @@ import net.md_5.bungee.command.CommandEnd;
import net.md_5.bungee.command.CommandIP; import net.md_5.bungee.command.CommandIP;
import net.md_5.bungee.command.CommandPerms; import net.md_5.bungee.command.CommandPerms;
import net.md_5.bungee.command.CommandReload; import net.md_5.bungee.command.CommandReload;
@ -421,7 +421,7 @@ index c84389cd..08699416 100644
import net.md_5.bungee.module.ModuleManager; import net.md_5.bungee.module.ModuleManager;
import net.md_5.bungee.netty.PipelineUtils; import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.DefinedPacket; import net.md_5.bungee.protocol.DefinedPacket;
@@ -89,7 +85,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage; @@ -95,7 +91,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
import net.md_5.bungee.query.RemoteQuery; import net.md_5.bungee.query.RemoteQuery;
import net.md_5.bungee.scheduler.BungeeScheduler; import net.md_5.bungee.scheduler.BungeeScheduler;
import net.md_5.bungee.util.CaseInsensitiveMap; import net.md_5.bungee.util.CaseInsensitiveMap;
@ -429,7 +429,7 @@ index c84389cd..08699416 100644
/** /**
* Main BungeeCord proxy class. * Main BungeeCord proxy class.
@@ -145,8 +140,12 @@ public class BungeeCord extends ProxyServer @@ -151,8 +146,12 @@ public class BungeeCord extends ProxyServer
private final File pluginsFolder = new File( "plugins" ); private final File pluginsFolder = new File( "plugins" );
@Getter @Getter
private final BungeeScheduler scheduler = new BungeeScheduler(); private final BungeeScheduler scheduler = new BungeeScheduler();
@ -442,7 +442,7 @@ index c84389cd..08699416 100644
@Getter @Getter
private final Logger logger; private final Logger logger;
public final Gson gson = new GsonBuilder() public final Gson gson = new GsonBuilder()
@@ -191,6 +190,8 @@ public class BungeeCord extends ProxyServer @@ -200,6 +199,8 @@ public class BungeeCord extends ProxyServer
} }
reloadMessages(); reloadMessages();
@ -451,7 +451,7 @@ index c84389cd..08699416 100644
// This is a workaround for quite possibly the weirdest bug I have ever encountered in my life! // 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, // 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, // using the loading class's implementation version. Normally this works completely fine,
@@ -209,6 +210,9 @@ public class BungeeCord extends ProxyServer @@ -218,6 +219,9 @@ public class BungeeCord extends ProxyServer
logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader ); logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) ); System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) ); System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
@ -506,5 +506,5 @@ index 10366c88..8c5cc949 100644
} }
-- --
2.14.3 2.16.1