Updated Upstream (BungeeCord)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
771f1735 Clearer message for illegal IP addresses
4428409d Netty 4.1.34.Final
52a125dd Add --help flag

BungeeCord

@@ -1 +1 @@
-Subproject commit caeabb5b62694ef761d5a0524b80cef2fa1d7abd
+Subproject commit 771f1735e5460909175d4a6e9713cdbe60ad8eec

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 6c8c19cd17895f753938e32d80bd00a5c9cad4ef Mon Sep 17 00:00:00 2001
+From e13d5e03ba9dbb686937c214bce85a6bfabd860c Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -483,7 +483,7 @@ index 15c0ada2..7073b404 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 4f8786a5..eba8af65 100644
+index 6cd54c2d..daaf18b9 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -578,7 +578,7 @@ index 4f8786a5..eba8af65 100644
  
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.32.Final</netty.version>
+         <netty.version>4.1.34.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->

BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch

@@ -1,4 +1,4 @@
-From 1c177ba6eb08c7c8d1a3f8c8bff33344fd70a008 Mon Sep 17 00:00:00 2001
+From 4bf66e9d8133c9aa8ccf0b13ab0042a62e062eb2 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
@@ -40,10 +40,10 @@ index 6599e38e..8d931b1d 100644
  
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index c38b8fc2..20681838 100644
+index 13f9812f..50195762 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -43,7 +43,7 @@ public class BungeeCordLauncher
+@@ -49,7 +49,7 @@ public class BungeeCordLauncher
              if ( buildDate.before( deadline.getTime() ) )
              {
                  System.err.println( "*** Warning, this build is outdated ***" );
@@ -52,7 +52,7 @@ index c38b8fc2..20681838 100644
                  System.err.println( "*** You will get NO support regarding this build ***" );
                  System.err.println( "*** Server will start in 10 seconds ***" );
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
-@@ -52,7 +52,7 @@ public class BungeeCordLauncher
+@@ -58,7 +58,7 @@ public class BungeeCordLauncher
  
          BungeeCord bungee = new BungeeCord();
          ProxyServer.setInstance( bungee );
@@ -101,5 +101,5 @@ index 4cfb13c0..0ec6dabb 100644
              InetSocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0011-Optimize-uuid-conversions.patch

@@ -1,4 +1,4 @@
-From 16db7bf30fa514ef45a16b5725e986f513f61f36 Mon Sep 17 00:00:00 2001
+From 467824fae00acdabcce056c0243a0fdf0690f53b Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@@ -208,7 +208,7 @@ index 00000000..cc24dd35
 +}
 \ No newline at end of file
 diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
-index cb84917e..52bdb94d 100644
+index 5e5b53a7..684abf4c 100644
 --- a/api/src/main/java/net/md_5/bungee/Util.java
 +++ b/api/src/main/java/net/md_5/bungee/Util.java
 @@ -2,11 +2,14 @@ package net.md_5.bungee;
@@ -226,7 +226,7 @@ index cb84917e..52bdb94d 100644
  /**
   * Series of utility classes to perform various operations.
   */
-@@ -43,7 +46,7 @@ public class Util
+@@ -48,7 +51,7 @@ public class Util
       */
      public static String hex(int i)
      {
@@ -262,5 +262,5 @@ index fff532de..13215254 100644
  
      @Override
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0035-Improve-outdated-build-message.patch

@@ -1,14 +1,14 @@
-From 73a8aa42b159f0d2c1e0b0f1ade0e52f7c5a2b93 Mon Sep 17 00:00:00 2001
+From d8dbe569ea22ef4720d8d0cde155074419e96a22 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 20681838..e615f1ff 100644
+index 50195762..9fab61ec 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -42,9 +42,9 @@ public class BungeeCordLauncher
+@@ -48,9 +48,9 @@ public class BungeeCordLauncher
              deadline.add( Calendar.WEEK_OF_YEAR, -4 );
              if ( buildDate.before( deadline.getTime() ) )
              {
@@ -22,5 +22,5 @@ index 20681838..e615f1ff 100644
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
              }
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,4 +1,4 @@
-From 59847386bf4c839a16b55b9b7a62627e57f637c7 Mon Sep 17 00:00:00 2001
+From b4677c171d3d0aae5a492540823c2b737db5fa41 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -232,7 +232,7 @@ index 00000000..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 5eab8750..5c9fefbe 100644
+index daaf18b9..4a007355 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -323,7 +323,7 @@ index 00000000..765d24bc
 +
 +}
 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 5f34eb4e..d246adb7 100644
+index 00f8a19c..c407cc97 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -44,7 +44,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -390,10 +390,10 @@ index 5f34eb4e..d246adb7 100644
          pluginManager = new PluginManager( this );
          getPluginManager().registerCommand( null, new CommandReload() );
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 31cde42d..eeacd0c8 100644
+index 9fab61ec..624eb5f0 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -57,6 +57,9 @@ public class BungeeCordLauncher
+@@ -63,6 +63,9 @@ public class BungeeCordLauncher
  
          if ( !options.has( "noconsole" ) )
          {
@@ -403,7 +403,7 @@ index 31cde42d..eeacd0c8 100644
              String line;
              while ( bungee.isRunning && ( line = bungee.getConsoleReader().readLine( ">" ) ) != null )
              {
-@@ -65,6 +68,8 @@ public class BungeeCordLauncher
+@@ -71,6 +74,8 @@ public class BungeeCordLauncher
                      bungee.getConsole().sendMessage( new ComponentBuilder( "Command not found" ).color( ChatColor.RED ).create() );
                  }
              }
@@ -457,5 +457,5 @@ index 10366c88..8c5cc949 100644
          }
  
 -- 
-2.20.1
+2.21.0