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 daac8d85e20baed2ee0107ee637d0e82af8b2cd1

Browse Source
This commit is contained in:
Troy Frew 2017-07-04 16:06:59 -04:00
parent d9bc29c5d5
commit 1c98857249
No known key found for this signature in database
GPG Key ID: 2B07581071A3CA7D
13 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit a5ffeae757d9fbb81efa87b1bae49ca5175f4007
Subproject commit daac8d85e20baed2ee0107ee637d0e82af8b2cd1

44
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From cc7e0c242fc8e3d42c575e38cfd52052946d0262 Mon Sep 17 00:00:00 2001
From 8170c6aa72e31d92fda0ea1e2138aee6d9b0ec1c Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 10:33:31 -0700
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Require Java 8
diff --git a/api/pom.xml b/api/pom.xml
index 96a46738..2a3c5eae 100644
index 96a4673..2a3c5ea 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -66,7 +66,7 @@ index 96a46738..2a3c5eae 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 9c02b389..f1b3a071 100644
index 9c02b38..f1b3a07 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,19 +4,19 @@
@ -125,7 +125,7 @@ index 9c02b389..f1b3a071 100644
<Specification-Version>${maven.build.timestamp}</Specification-Version>
</manifestEntries>
diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
index b7cb81e2..a4516ed9 100644
index b7cb81e..a4516ed 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
@@ -5,9 +5,9 @@ public class Bootstrap
@ -141,7 +141,7 @@ index b7cb81e2..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 970e3097..a908c13e 100644
index 970e309..a908c13 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,23 +4,24 @@
@ -178,7 +178,7 @@ index 970e3097..a908c13e 100644
<dependencies>
diff --git a/config/pom.xml b/config/pom.xml
index 253bfdff..d3146344 100644
index 253bfdf..d314634 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -208,7 +208,7 @@ index 253bfdff..d3146344 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 6132e8e9..a387b2c0 100644
index 6132e8e..a387b2c 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -236,7 +236,7 @@ index 6132e8e9..a387b2c0 100644
+ <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project>
diff --git a/log/pom.xml b/log/pom.xml
index 2fcbbad6..b54e01a0 100644
index 2fcbbad..b54e01a 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -277,7 +277,7 @@ index 2fcbbad6..b54e01a0 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 220f0421..2d81204b 100644
index 220f042..2d81204 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -300,7 +300,7 @@ index 220f0421..2d81204b 100644
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 928f63a8..f22790a3 100644
index 928f63a..f22790a 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -323,7 +323,7 @@ index 928f63a8..f22790a3 100644
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 689b83ee..0e693f11 100644
index 689b83e..0e693f1 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -346,7 +346,7 @@ index 689b83ee..0e693f11 100644
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index e50a4bec..ba6de230 100644
index e50a4be..ba6de23 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -369,7 +369,7 @@ index e50a4bec..ba6de230 100644
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index daf146dc..e00697fe 100644
index daf146d..e00697f 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -392,7 +392,7 @@ index daf146dc..e00697fe 100644
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index aff2c070..2b827bb0 100644
index aff2c07..2b827bb 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -440,7 +440,7 @@ index aff2c070..2b827bb0 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 8e82446f..091ea8cf 100644
index 8e82446..091ea8c 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -463,7 +463,7 @@ index 8e82446f..091ea8cf 100644
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index 082f0908..8b045e3b 100644
index 082f090..8b045e3 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -493,7 +493,7 @@ index 082f0908..8b045e3b 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 5a03519e..144e3f14 100644
index 5a03519..144e3f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,23 +4,24 @@
@ -688,7 +688,7 @@ index 5a03519e..144e3f14 100644
+ </profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index bf4b399a..9a4b6529 100644
index bf4b399..9a4b652 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,24 +4,24 @@
@ -725,7 +725,7 @@ index bf4b399a..9a4b6529 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 3b36612c..85b9df7d 100644
index 1eae873..98656fe 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -752,7 +752,7 @@ index 3b36612c..85b9df7d 100644
<description>Proxy component of the Elastic Portal Suite</description>
<properties>
@@ -49,32 +49,32 @@
@@ -55,32 +55,32 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -796,7 +796,7 @@ index 3b36612c..85b9df7d 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 9ecb2612..4b3613fa 100644
index 9ecb261..4b3613f 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -837,5 +837,5 @@ index 9ecb2612..4b3613fa 100644
<scope>compile</scope>
</dependency>
--
2.13.0
2.7.4 (Apple Git-66)

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

@ -1,11 +1,11 @@
From 42fd1a98ebe2532206ca05ae1419d2143df04990 Mon Sep 17 00:00:00 2001
From 152307e7f87fab326ac5c0d6658d3818c5395884 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
diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index 3c1bbe93..8766e04b 100644
index 3c1bbe9..8766e04 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -42,7 +42,7 @@ public class BungeeCordLauncher
@ -27,7 +27,7 @@ index 3c1bbe93..8766e04b 100644
if ( !options.has( "noconsole" ) )
diff --git a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
index f1ccd4f6..d703d6d2 100644
index f1ccd4f..d703d6d 100644
--- a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
+++ b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
@@ -12,7 +12,7 @@ public class LogDispatcher extends Thread
@ -40,7 +40,7 @@ index f1ccd4f6..d703d6d2 100644
}
diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
index 9d51608d..446dfe2f 100644
index 9d51608..446dfe2 100644
--- a/proxy/src/main/java/Test.java
+++ b/proxy/src/main/java/Test.java
@@ -19,7 +19,7 @@ public class Test
@ -53,7 +53,7 @@ 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 653a4720..140a63fb 100644
index 0d11201..de2158c 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -178,7 +178,7 @@ public class BungeeCord extends ProxyServer
@ -65,7 +65,7 @@ index 653a4720..140a63fb 100644
System.setSecurityManager( new BungeeSecurityManager() );
@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
@@ -475,7 +475,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -75,7 +75,7 @@ index 653a4720..140a63fb 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
index b0798791..b26035cf 100644
index b079879..b26035c 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
@@ -16,6 +16,6 @@ public class CommandBungee extends Command
@ -87,7 +87,7 @@ index b0798791..b26035cf 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
index cbbe03c7..4a492414 100644
index cbbe03c..4a49241 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
@@ -22,7 +22,7 @@ public class CommandReload extends Command
@ -101,7 +101,7 @@ index cbbe03c7..4a492414 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index c7547c7f..82ff91ae 100644
index 8d79b5a..754ae9a 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -200,7 +200,7 @@ public class YamlConfig implements ConfigurationAdapter
@ -114,5 +114,5 @@ index c7547c7f..82ff91ae 100644
InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.13.0
2.7.4 (Apple Git-66)

8
BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From 7c409c20042b2ea819c4b08165d8b4387384981f Mon Sep 17 00:00:00 2001
From 8c4ac3ae1dcfd693fd27f148c01ca7efbba9876a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -69,10 +69,10 @@ index c2dd942..c0a5061 100644
// changes in the packet are ignored so we need to send it manually
con.unsafe().sendPacket( pluginMessage );
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 7fd2ff7..a70a215 100644
index f239c7d..384d958 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -40,9 +40,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
@@ -41,9 +41,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
public class PipelineUtils
{
@ -86,5 +86,5 @@ index 7fd2ff7..a70a215 100644
{
@Override
--
2.10.0
2.7.4 (Apple Git-66)

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

@ -1,14 +1,14 @@
From f64081bf3f96b461e7ca9190fa2f2be8dd093eaa Mon Sep 17 00:00:00 2001
From f8d0ba43375d4b294aadadbd7209b290fe196c0b 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 9b07c805..39ef4882 100644
index 2b17e7a..34e3c3e 100644
--- a/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
@@ -320,6 +320,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 9b07c805..39ef4882 100644
.childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops )
--
2.12.0
2.7.4 (Apple Git-66)

6
BungeeCord-Patches/0016-Enable-TCP_NODELAY.patch
View File

@ -1,4 +1,4 @@
From bcc815e0187479c61481452bfbd63e344f9961d5 Mon Sep 17 00:00:00 2001
From 44948384b21aae93e25edb1fe70ee2911b5e8c53 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Wed, 24 Feb 2016 17:16:23 +0000
Subject: [PATCH] Enable TCP_NODELAY.
@ -6,10 +6,10 @@ Subject: [PATCH] Enable TCP_NODELAY.
This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index a70a215..5ba31a4 100644
index 384d958..67624b3 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -120,6 +120,7 @@ public class PipelineUtils
@@ -128,6 +128,7 @@ public class PipelineUtils
{
// IP_TOS is not supported (Windows XP / Windows Server 2003)
}

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

@ -1,4 +1,4 @@
From eb365e4eb92512df20c033527375a744d8722042 Mon Sep 17 00:00:00 2001
From 24ac547d72897b6331246870ae473629fd2ed25c 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
@ -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 71a5a15..520ee31 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 39ef4882..eb3f9973 100644
index 34e3c3e..93dd74e 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -488,7 +488,9 @@ public class BungeeCord extends ProxyServer
@@ -493,7 +493,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>";
try
{
@ -46,7 +46,7 @@ index 39ef4882..eb3f9973 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
index f1ac3a8c..87e9e239 100644
index f28e718..a70ac2c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -548,7 +548,7 @@ public final class UserConnection implements ProxiedPlayer
@ -59,7 +59,7 @@ index f1ac3a8c..87e9e239 100644
@Override
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 c0a5061a..ce32f6b1 100644
index c0a5061..ce32f6b 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -222,7 +222,6 @@ public class DownstreamBridge extends PacketHandler
@ -79,5 +79,5 @@ index c0a5061a..ce32f6b1 100644
String subChannel = in.readUTF();
--
2.12.0
2.7.4 (Apple Git-66)

14
BungeeCord-Patches/0021-Don-t-create-a-new-KickStringWriter-for-each-new-con.patch
View File

@ -1,4 +1,4 @@
From 140b09bb77d5b6a404e0207aa876f21662ca1639 Mon Sep 17 00:00:00 2001
From d87d823880803c530b1ec8783527ce20fb7590eb Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Tue, 26 Jan 2016 01:01:57 +0000
Subject: [PATCH] Don't create a new KickStringWriter for each new connection.
@ -21,19 +21,19 @@ index eda9571..e5275c7 100644
{
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 5ba31a4..f6a10e7 100644
index 67624b3..503adfd 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -52,7 +52,7 @@ public class PipelineUtils
@@ -55,7 +55,7 @@ public class PipelineUtils
ch.pipeline().addBefore( FRAME_DECODER, LEGACY_DECODER, new LegacyDecoder() );
ch.pipeline().addAfter( FRAME_DECODER, PACKET_DECODER, new MinecraftDecoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) );
ch.pipeline().addAfter( FRAME_PREPENDER, PACKET_ENCODER, new MinecraftEncoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) );
- ch.pipeline().addBefore( FRAME_PREPENDER, LEGACY_KICKER, new KickStringWriter() );
+ ch.pipeline().addBefore( FRAME_PREPENDER, LEGACY_KICKER, PipelineUtils.KICK_STRING_WRITER );
ch.pipeline().get( HandlerBoss.class ).setHandler( new InitialHandler( BungeeCord.getInstance(), ch.attr( LISTENER ).get() ) );
}
};
@@ -68,6 +68,7 @@ public class PipelineUtils
ch.pipeline().get( HandlerBoss.class ).setHandler( new InitialHandler( BungeeCord.getInstance(), listener ) );
if ( listener.isProxyProtocol() )
@@ -76,6 +76,7 @@ public class PipelineUtils
public static final String FRAME_PREPENDER = "frame-prepender";
public static final String LEGACY_DECODER = "legacy-decoder";
public static final String LEGACY_KICKER = "legacy-kick";

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

@ -1,4 +1,4 @@
From 5f631f797f46a5f9d327f3f8f593dbfc84cdf936 Mon Sep 17 00:00:00 2001
From 1685165446a90c7171c880b78c92760c3007d8a5 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 eb3f9973..9d7a25ab 100644
index 93dd74e..1073f8f 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
@ -30,7 +30,7 @@ index eb3f9973..9d7a25ab 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -319,7 +320,7 @@ public class BungeeCord extends ProxyServer
@@ -324,7 +325,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 eb3f9973..9d7a25ab 100644
.localAddress( info.getHost() )
.bind().addListener( listener );
@@ -340,7 +341,7 @@ public class BungeeCord extends ProxyServer
@@ -345,7 +346,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index eb3f9973..9d7a25ab 100644
}
}
}
@@ -403,12 +404,14 @@ public class BungeeCord extends ProxyServer
@@ -408,12 +409,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
@ -70,7 +70,7 @@ index eb3f9973..9d7a25ab 100644
if ( reconnectHandler != null )
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index bc56d4f3..efcba311 100644
index bc56d4f..efcba31 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -145,7 +145,7 @@ public class BungeeServerInfo implements ServerInfo
@ -83,5 +83,5 @@ index bc56d4f3..efcba311 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
.remoteAddress( getAddress() )
--
2.12.0
2.7.4 (Apple Git-66)

10
BungeeCord-Patches/0026-Better-Decompression-Sanity.patch
View File

@ -1,4 +1,4 @@
From ef4ae5cdca9db80a655c5f2d98e516efac9a7524 Mon Sep 17 00:00:00 2001
From 9f9b2f38183801c34733fd169222be1614c8d0a2 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity
@ -6,7 +6,7 @@ Subject: [PATCH] Better Decompression Sanity
Fixes #40
diff --git a/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java b/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java
index 21b3ea2b..37fe6ac7 100644
index 21b3ea2..37fe6ac 100644
--- a/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java
+++ b/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java
@@ -1,5 +1,7 @@
@ -45,10 +45,10 @@ index 21b3ea2b..37fe6ac7 100644
out.add( decompressed );
decompressed = null;
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
index 9050534a..a82deb4b 100644
index 2b2d15b..edb72b9 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -141,7 +141,7 @@ public class ChannelWrapper
@@ -147,7 +147,7 @@ public class ChannelWrapper
if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold != -1 )
{
@ -58,5 +58,5 @@ index 9050534a..a82deb4b 100644
if ( compressionThreshold == -1 )
{
--
2.11.1
2.7.4 (Apple Git-66)

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

@ -1,4 +1,4 @@
From 135b4d01ad4b618ba569f66bff535e8217785cb1 Mon Sep 17 00:00:00 2001
From 5e8db527fef5b35b6ac96b4be5b41aae8a5ede9c 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.
@ -8,7 +8,7 @@ The provided methods will not move a player if a server is removed or the server
Thanks to Overcast for the idea
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 5a49050a..f04e2bf4 100644
index 5a49050..f04e2bf 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
@@ -32,9 +32,83 @@ public interface ProxyConfig
@ -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 11c5b68..1c011d0 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
@ -126,7 +126,7 @@ index 11c5b685..1c011d08 100644
* 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
index 967a1b2a..08aa6981 100644
index 967a1b2..08aa698 100644
--- a/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
@ -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 8a4b2283..95750d44 100644
index a5d63d6..a446b09 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -565,10 +565,18 @@ public class BungeeCord extends ProxyServer
@@ -570,10 +570,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}
@ -168,7 +168,7 @@ index 8a4b2283..95750d44 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index b3ff1448..669720a6 100644
index b3ff144..669720a 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -1,6 +1,7 @@
@ -285,5 +285,5 @@ index b3ff1448..669720a6 100644
+ // Waterfall end
}
--
2.12.0
2.7.4 (Apple Git-66)

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

@ -1,11 +1,11 @@
From 342db8c2606533eeee5b8ed5b33d486b8ab8dba3 Mon Sep 17 00:00:00 2001
From d22587da29905588035c8bd58a039b49ed7dc049 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
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 f04e2bf4..a4436141 100644
index f04e2bf..a443614 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
@@ -168,6 +168,11 @@ public interface ProxyConfig
@ -21,7 +21,7 @@ index f04e2bf4..a4436141 100644
/**
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 68f25460..59835815 100644
index 68f2546..5983581 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
@@ -4,8 +4,11 @@ import lombok.*;
@ -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 3d0288f3..59d55fc0 100644
index a446b09..60f3925 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -614,7 +614,7 @@ public class BungeeCord extends ProxyServer
@@ -619,7 +619,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{
@ -72,5 +72,5 @@ index 3d0288f3..59d55fc0 100644
@Override
--
2.13.0
2.7.4 (Apple Git-66)

14
BungeeCord-Patches/0040-Use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From 4e5f8b6986efb9ca27fb5662c63869d82dfaf601 Mon Sep 17 00:00:00 2001
From c0d6188b4987814068db056085aa50db72efc1e3 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Use async Netty DNS resolver
@ -6,10 +6,10 @@ Subject: [PATCH] Use async Netty DNS resolver
We no longer need to cache the address for the session server now.
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 85b9df7d..90dd3fa4 100644
index 98656fe..ae6ee15 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -35,6 +35,14 @@
@@ -41,6 +41,14 @@
<version>${netty.version}</version>
<scope>compile</scope>
</dependency>
@ -25,7 +25,7 @@ index 85b9df7d..90dd3fa4 100644
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
index 2feb4d66..3db36399 100644
index 2feb4d6..3db3639 100644
--- a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
+++ b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
@@ -27,7 +27,11 @@ public class HttpClient
@ -94,10 +94,10 @@ index 2feb4d66..3db36399 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index f6a10e77..ddf598ef 100644
index 503adfd..ad47dbb 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -103,7 +103,7 @@ public class PipelineUtils
@@ -111,7 +111,7 @@ public class PipelineUtils
return epoll ? EpollSocketChannel.class : NioSocketChannel.class;
}
@ -107,5 +107,5 @@ index f6a10e77..ddf598ef 100644
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
}
--
2.13.0
2.7.4 (Apple Git-66)