Updated Upstream (BungeeCord)

BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch

@@ -1,12 +1,12 @@
-From f2f55cb7743a44bc8d0db757315cbfab4d43f22f Mon Sep 17 00:00:00 2001
+From bb63e70de301f4cb8bc2ee1b72e074c7a9338582 Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 Date: Thu, 19 May 2016 11:34:52 -0700
 Subject: [PATCH] Fetch modules from the Waterfall API endpoint
 
 Don't fetch from the BungeeCord CI, as that only has their modules
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
-index 2536435c..5bb86152 100644
+index 064639f3..2337f615 100644
 --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
 +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
 @@ -1,10 +1,10 @@
@@ -21,9 +21,9 @@ index 2536435c..5bb86152 100644
 +import java.nio.file.StandardCopyOption;
  import lombok.Data;
  import net.md_5.bungee.Util;
-
-@@ -18,13 +18,21 @@ public class JenkinsModuleSource implements ModuleSource
-         System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
+ import net.md_5.bungee.api.ProxyServer;
+@@ -19,14 +19,22 @@ public class JenkinsModuleSource implements ModuleSource
+         ProxyServer.getInstance().getLogger().info( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
          try
          {
 -            URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
@@ -42,10 +42,12 @@ index 2536435c..5bb86152 100644
 +            con.setRequestProperty( "User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36" );
 
 -            Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
+-            ProxyServer.getInstance().getLogger().info( "Download complete" );
 +            Files.copy( con.getInputStream(), module.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING );
-             System.out.println( "Download complete" );
++            System.out.println( "Download complete" );
          } catch ( IOException ex )
          {
+             ProxyServer.getInstance().getLogger().warning( "Failed to download: " + Util.exception( ex ) );
 -- 
-2.43.0
+2.46.1.windows.1
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,14 +1,14 @@
-From d3093e6e77a840c31a9d064743bb06d0cac74987 Mon Sep 17 00:00:00 2001
+From 74a53eaee97d08fc03afd24ba8fab7a29b780db0 Mon Sep 17 00:00:00 2001
 From: Troy Frew <[email protected]>
 Date: Tue, 15 Nov 2016 09:07:51 -0500
 Subject: [PATCH] Fixup ProtocolConstants
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index 82ef4c5d..ef45ea31 100644
+index 9028dc13..73eff9ed 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-@@ -121,6 +121,16 @@ public class ProtocolConstants
+@@ -122,6 +122,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 82ef4c5d..ef45ea31 100644
      {
 
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From fb960e8c0e54f29fc650000f64df2e131a35bae9 Mon Sep 17 00:00:00 2001
+From 4e53258f08ecc825ce2f292f71ef5cc74f33ba84 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@@ -250,10 +250,10 @@ index e582808f..29cd91dd 100644
      }
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 1d9a9ee5..616adcf1 100644
+index 224f231b..b7d7e71a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -806,7 +806,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -823,7 +823,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -263,5 +263,5 @@ index 1d9a9ee5..616adcf1 100644
 
      @Override
 -- 
-2.44.0.windows.1
+2.46.1.windows.1
 

BungeeCord-Patches/0013-Enable-TCP_NODELAY.patch

@@ -1,15 +1,15 @@
-From d18340b80a0374b23b4b6658af9c09ce817c1691 Mon Sep 17 00:00:00 2001
+From 18f17a842d00c85ea1c7191196f43f6a66d0a640 Mon Sep 17 00:00:00 2001
 From: Harry <[email protected]>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 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 544d34ed..6a0d3351 100644
+index 380b6012..f1fce77b 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
-@@ -195,6 +195,7 @@ public class PipelineUtils
+@@ -194,6 +194,7 @@ public class PipelineUtils
              {
                  // IP_TOS is not supported (Windows XP / Windows Server 2003)
              }
@@ -18,5 +18,5 @@ index 544d34ed..6a0d3351 100644
              ch.config().setWriteBufferWaterMark( MARK );
 
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

BungeeCord-Patches/0015-Allow-invalid-packet-ids-for-forge-servers.patch

@@ -1,4 +1,4 @@
-From cb1c3f31d81392c174068578a8ae931b10a525b5 Mon Sep 17 00:00:00 2001
+From 52d3157c6b8782b2f1d60c750c41bb369cab67c1 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -37,10 +37,10 @@ index d79d5e5c..250e7620 100644
              {
                  packet.read( in, protocol, prot.getDirection(), protocolVersion );
 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 317fb2d4..db50f379 100644
+index 35712217..b310ab1e 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -884,14 +884,23 @@ public enum Protocol
+@@ -913,14 +913,23 @@ public enum Protocol
              return protocol;
          }
 
@@ -66,7 +66,7 @@ index 317fb2d4..db50f379 100644
                  throw new BadPacketException( "Packet with id " + id + " outside of range" );
              }
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 7a211f1b..a25a493e 100644
+index 99a539fb..e192e09e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -234,6 +234,12 @@ public class ServerConnector extends PacketHandler
@@ -83,10 +83,10 @@ index 7a211f1b..a25a493e 100644
 
          ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 70b58fab..0045a449 100644
+index 755b8fd6..699bbe3a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-@@ -343,6 +343,12 @@ public abstract class EntityMap
+@@ -345,6 +345,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
 
@@ -100,5 +100,5 @@ index 70b58fab..0045a449 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

BungeeCord-Patches/0017-Improve-server-list-ping-logging.patch

@@ -1,4 +1,4 @@
-From f85ac2fff95f74a284ba4054e73d186d384c0bad Mon Sep 17 00:00:00 2001
+From dc4f3bf23c46e3461fda2d4a1ad71b04f5520181 Mon Sep 17 00:00:00 2001
 From: Janmm14 <[email protected]>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this
 patch remains for a few misc improvements around here
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index a25a493e..63920e7e 100644
+index e192e09e..3ee16609 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler
+@@ -521,6 +521,6 @@ public class ServerConnector extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,10 +31,10 @@ index b501f7bd..1c075a9f 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 616adcf1..0fbe8b0d 100644
+index b7d7e71a..72f6111e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -812,20 +812,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -829,20 +829,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -69,5 +69,5 @@ index bfd5cb5f..2dafa4d9 100644
      }
  }
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

BungeeCord-Patches/0018-Add-a-property-to-accept-invalid-ping-packets.patch

@@ -1,4 +1,4 @@
-From 78524508576e2e5b6238d1f032b0e85c1a66f1f9 Mon Sep 17 00:00:00 2001
+From cfbe87c2b7227e70ca01313b8987382afdaaa877 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
 Fixes #23
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 0fbe8b0d..deb9fef3 100644
+index 72f6111e..fd577788 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -325,10 +325,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -333,10 +333,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
 
@@ -29,5 +29,5 @@ index 0fbe8b0d..deb9fef3 100644
          disconnect( "" );
      }
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

BungeeCord-Patches/0020-Better-Decompression-Sanity.patch

@@ -1,4 +1,4 @@
-From aa142880fb007f1f6b5c98ef015a795650ce02ca Mon Sep 17 00:00:00 2001
+From 8d60c27628af80ae7ad47a7547446673f3b0f10f Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Fri, 18 Mar 2016 10:53:24 -0700
 Subject: [PATCH] Better Decompression Sanity
@@ -45,10 +45,10 @@ index 445ee947..eaedf4bc 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 e8d5ed19..00e03bae 100644
+index 682bb807..e0a35f73 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
-@@ -181,7 +181,7 @@ public class ChannelWrapper
+@@ -185,7 +185,7 @@ public class ChannelWrapper
 
          if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold >= 0 )
          {
@@ -58,5 +58,5 @@ index e8d5ed19..00e03bae 100644
          if ( compressionThreshold < 0 )
          {
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

BungeeCord-Patches/0024-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From 563bd03606a290b8321f36934b12c57902909530 Mon Sep 17 00:00:00 2001
+From c44fb8ec42deae2b04563fee66642b15d20e41ed Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <[email protected]>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -68,10 +68,10 @@ index 3f9efaa8..5d2597ad 100644
      /**
       * @return the kick reason
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 63920e7e..e10f33ad 100644
+index 3ee16609..a928acd1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -439,7 +439,7 @@ public class ServerConnector extends PacketHandler
+@@ -438,7 +438,7 @@ public class ServerConnector extends PacketHandler
          ServerKickEvent event = new ServerKickEvent( user, target, new BaseComponent[]
          {
              kick.getMessage()
@@ -164,5 +164,5 @@ index 1c075a9f..23c34eff 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From 4f8c5cb5bace2a92578dd41227ed91a173e4b58c Mon Sep 17 00:00:00 2001
+From dfe7d56fc75749c2f9ff0d290ea850619bd38344 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -509,19 +509,6 @@ index 3e5ca394..00000000
 -        return ( lastSpace == -1 ) ? cursor - buffer.length() : cursor - ( buffer.length() - lastSpace - 1 );
 -    }
 -}
-diff --git a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
-index 9ec4920e..d3abee44 100644
---- a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
-+++ b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
-@@ -44,7 +44,7 @@ public class ModuleManager
-         ModuleVersion bungeeVersion = ModuleVersion.parse( proxy.getVersion() );
-         if ( bungeeVersion == null )
-         {
--            System.out.println( "Couldn't detect bungee version. Custom build?" );
-+            proxy.getLogger().warning( "Couldn't detect bungee version. Custom build?" ); // Waterfall - Use logger
-             return;
-         }
-
 diff --git a/slf4j/nb-configuration.xml b/slf4j/nb-configuration.xml
 deleted file mode 100644
 index 7e465924..00000000
@@ -1629,5 +1616,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 

BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch

@@ -1,4 +1,4 @@
-From 18d2f5e44e0ebd0a61ee9e77b7c7b361e3d207c0 Mon Sep 17 00:00:00 2001
+From 4718337b23a598add2368142ace917cbb0d9de7f Mon Sep 17 00:00:00 2001
 From: Gabriele C <[email protected]>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
@@ -61,10 +61,10 @@ index ef44d334..4ff8da6d 100644
      public String getGameVersion() {
          return gameVersion;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 05261ccf..fcd973e5 100644
+index 1a6b7ae3..d6872035 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -388,7 +388,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -396,7 +396,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
              case 3:
                  transferred = handshake.getRequestedProtocol() == 3;
                  // Login
@@ -77,5 +77,5 @@ index 05261ccf..fcd973e5 100644
                  ch.setProtocol( Protocol.LOGIN );
 
 -- 
-2.45.1.windows.1
+2.46.1.windows.1