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 2017-11-10 17:53:59 +00:00
parent ef09beba3d
commit 60905d7d56
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
9 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 0fc5694b6a08e07d7c31a512995239fe8ffd047e
Subproject commit 2e826a15e73166538093514b09281db3c44ca896

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

@ -1,4 +1,4 @@
From 518de0fcb50890c308f081520d29cef9ce3b436c Mon Sep 17 00:00:00 2001
From b8244a39704c2a4b777cdd982083daeade84bbb1 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,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 b4c8bcfc..510841c7 100644
index 43c8862f..95b7c060 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 b4c8bcfc..510841c7 100644
System.setSecurityManager( new BungeeSecurityManager() );
@@ -475,7 +475,7 @@ public class BungeeCord extends ProxyServer
@@ -468,7 +468,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -87,10 +87,10 @@ 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 771ef5dc..f5c028dd 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
@@ -23,7 +23,7 @@ public class CommandReload extends Command
BungeeCord.getInstance().startListeners();
BungeeCord.getInstance().getPluginManager().callEvent( new ProxyReloadEvent( sender ) );
@ -114,5 +114,5 @@ index 408312fd..95590b6d 100644
InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.14.1
2.14.3

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

@ -1,4 +1,4 @@
From 88b1421ce7a232107d3c5b1866718f4ff98ad630 Mon Sep 17 00:00:00 2001
From 843cdaca4e3322b60407704cfdfd1c83833a43d0 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 78808fb9..4f4c9773 100644
index fb349dcf..b859b498 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -290,7 +290,9 @@ public class BungeeCord extends ProxyServer
@@ -283,7 +283,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.14.1
2.14.3

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

@ -1,14 +1,14 @@
From 105c216b798e10799a86226f72e5d0e7597e1c1a Mon Sep 17 00:00:00 2001
From 3183b60a0e68f2ab100d18ed2789f9a8e37fe14b 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 0d7d1adf..c03941ed 100644
index 538b4b1c..82c3ec14 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -320,6 +320,8 @@ public class BungeeCord extends ProxyServer
@@ -313,6 +313,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 0d7d1adf..c03941ed 100644
.childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops )
--
2.14.1
2.14.3

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

@ -1,4 +1,4 @@
From 5abce36d076e7384cfac4a0659d3d95e8dc1d05c Mon Sep 17 00:00:00 2001
From 199c5347f3d8ee7a56f86e0cdbb76d845bede1a6 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 c03941ed..226af98b 100644
index 82c3ec14..6b40faaa 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -493,7 +493,9 @@ public class BungeeCord extends ProxyServer
@@ -501,7 +501,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>";
try
{
@ -79,5 +79,5 @@ index a92b806c..19fd3b3b 100644
String subChannel = in.readUTF();
--
2.14.1
2.14.3

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

@ -1,4 +1,4 @@
From 4596ac8317ab8925e4576e9cbdd05165a01dbbdf Mon Sep 17 00:00:00 2001
From 98a9df1d1ca47ec3718f5ba34fe033ec3b36a39e 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 226af98b..9ce19d9a 100644
index 6b40faaa..264554f5 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 226af98b..9ce19d9a 100644
/**
* locations.yml save thread.
*/
@@ -251,7 +251,8 @@ public class BungeeCord extends ProxyServer
@@ -244,7 +244,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
}
@ -30,7 +30,7 @@ index 226af98b..9ce19d9a 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -324,7 +325,7 @@ public class BungeeCord extends ProxyServer
@@ -317,7 +318,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 226af98b..9ce19d9a 100644
.localAddress( info.getHost() )
.bind().addListener( listener );
@@ -345,7 +346,7 @@ public class BungeeCord extends ProxyServer
@@ -338,7 +339,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index 226af98b..9ce19d9a 100644
}
}
}
@@ -436,12 +437,14 @@ public class BungeeCord extends ProxyServer
@@ -429,12 +430,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
@ -70,7 +70,7 @@ index 226af98b..9ce19d9a 100644
getLogger().info( "Thank you and goodbye" );
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 9756c09c..648cd273 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.14.1
2.14.3

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

@ -1,4 +1,4 @@
From e917f0bdcc43a2177e76d4c1d10fffcb7f59c50e Mon Sep 17 00:00:00 2001
From deb0bcb1efc19636ac2be9f2a785abcfa20a7a83 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.
@ -157,10 +157,10 @@ index b3ff750f..43d11cf2 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 9ce19d9a..69e5dc33 100644
index 264554f5..a7502730 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -569,10 +569,18 @@ public class BungeeCord extends ProxyServer
@@ -577,10 +577,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}
@ -298,5 +298,5 @@ index d131c02c..a755121a 100644
+ // Waterfall end
}
--
2.14.1
2.14.3

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

@ -1,4 +1,4 @@
From a3d9daab37b857023cf33922887536fad4137b5f Mon Sep 17 00:00:00 2001
From a22387e75ed2f41b9a5b4399ce234801e8b1a95d 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 69e5dc33..b822f95b 100644
index a7502730..b67de209 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -618,7 +618,7 @@ public class BungeeCord extends ProxyServer
@@ -626,7 +626,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{
@ -72,5 +72,5 @@ index 69e5dc33..b822f95b 100644
@Override
--
2.14.1
2.14.3

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

@ -1,4 +1,4 @@
From b82d1273ed42f5c59a0fa7428521f551a9b7ca81 Mon Sep 17 00:00:00 2001
From b091ce13789be1c1f5ef60c814bfd7221044ad49 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..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
index b822f95b..da2904b0 100644
index b67de209..0cba0076 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;
@ -436,16 +436,16 @@ index b822f95b..da2904b0 100644
@Getter
private final Logger logger;
public final Gson gson = new GsonBuilder()
@@ -197,6 +197,8 @@ public class BungeeCord extends ProxyServer
}
@@ -190,6 +190,8 @@ public class BungeeCord extends ProxyServer
}
reloadMessages();
+ // Waterfall start - Use TerminalConsoleAppender and Log4J
+ /*
// 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,
@@ -214,6 +216,9 @@ public class BungeeCord extends ProxyServer
@@ -207,6 +209,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 ) );
@ -469,5 +469,5 @@ index 10366c88..8c5cc949 100644
}
--
2.14.1
2.14.3