Updated Upstream (BungeeCord)

Upstream has released updates that appear 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:
c92581d0 #3556: Deserialize arrays to single components
e442c3da #3546: Add string length checks to isValidName
f903c54d #3554: Bump org.apache.maven.plugins:maven-checkstyle-plugin
0d453789 #3540: Add TextComponent#fromLegacy() as an array-free alternative to #fromLegacyText()
0f5f09b6 Minecraft 23w43b support
e5c80d00 Fix code formatting
9cdb2ba3 Deprecate exposed scoreboard API
d0e5cf7c #3549: Bump io.netty:netty-bom from 4.1.99.Final to 4.1.100.Final
c8568764 Fix writing non-compound root NBT tags

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From d002f1654018a69fdee68237fff9aa1442363bc2 Mon Sep 17 00:00:00 2001
+From 3b1984106e3bfd5e2504ae84797ec65d8a8dca42 Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -68,7 +68,7 @@ index 30739518..bdccbd78 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index b10e7a38..07d49112 100644
+index 2b80f83b..fc09cc11 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,39 +4,40 @@
@@ -515,7 +515,7 @@ index a4265e54..5e9d29d7 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index ed3c1a87..a6684b7c 100644
+index 9725c974..3a72aa08 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -633,7 +633,7 @@ index ed3c1a87..a6684b7c 100644
 +             <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
-                 <version>3.3.0</version>
+                 <version>3.3.1</version>
 @@ -173,6 +197,7 @@
                      </dependency>
                  </dependencies>
@@ -667,7 +667,7 @@ index ed3c1a87..a6684b7c 100644
                              </execution>
                          </executions>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index f1c169a9..12096614 100644
+index 4d611101..76a3510d 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,19 +4,19 @@
@@ -694,9 +694,9 @@ index f1c169a9..12096614 100644
 +    <name>Waterfall-Protocol</name>
 +    <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
 
-     <!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
+     <!-- We really shouldn't depend on external repositories -->
      <repositories>
-@@ -41,8 +41,8 @@
+@@ -35,8 +35,8 @@
              <scope>compile</scope>
          </dependency>
          <dependency>

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,14 +1,14 @@
-From d86bb6401198008a6cc41ab73ebd1f253322ff7c Mon Sep 17 00:00:00 2001
+From 6420147c00011f92af85e62463d3a88048b96d32 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 7d5e2635..a0dd9be6 100644
+index d92a66d9..fedf6e99 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
-@@ -114,6 +114,16 @@ public class ProtocolConstants
+@@ -115,6 +115,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 

BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch

@@ -1,4 +1,4 @@
-From 8c8b25883c768d798456d7289d057275d790b677 Mon Sep 17 00:00:00 2001
+From eb1f1b27dbbd6f6831b35c21ecfb2cfe4a675da1 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -43,10 +43,10 @@ index 70b292f0..91f71c09 100644
       * Allow this packet to be sent as an "extended" packet.
       */
 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 409464d2..76db3a71 100644
+index 5ca53d81..4f1011b9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -265,7 +265,7 @@ public class ServerConnector extends PacketHandler
+@@ -266,7 +266,7 @@ public class ServerConnector extends PacketHandler
 
                  ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
                  DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -56,7 +56,7 @@ index 409464d2..76db3a71 100644
              }
 
 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 117ebb76..b8248ec4 100644
+index 8f955fdc..3ff8e553 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
 @@ -300,7 +300,7 @@ public class DownstreamBridge extends PacketHandler

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

@@ -1,4 +1,4 @@
-From f2c91fe1c64c1b9d468063c57165a808be7235e1 Mon Sep 17 00:00:00 2001
+From 1668e9e6e23ce2d43df05c7d496cdd086cadd4b9 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
@@ -237,7 +237,7 @@ index 6352951c..91efc0a6 100644
 
      /**
 diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
-index 88d36ad2..fc92a7b5 100644
+index e582808f..29cd91dd 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
 @@ -74,7 +74,7 @@ public class ServerPing
@@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 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 09080f36..14a34f99 100644
+index 0bcbc8fb..6562a641 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
-@@ -722,7 +722,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -718,7 +718,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {

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

@@ -1,4 +1,4 @@
-From 0a7710b54fbc938b1913070090ebeb7b6e3bdd5f Mon Sep 17 00:00:00 2001
+From d8cc33712c4b60c77f3a9c793f90c85a9a9f2d74 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <[email protected]>
 Date: Tue, 25 Oct 2016 12:23:07 -0400
 Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
 No breaking changes occur due to this patch.
 
 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 76db3a71..3aacebe1 100644
+index 4f1011b9..8a57c5a8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator;
@@ -23,7 +23,7 @@ index 76db3a71..3aacebe1 100644
  import java.util.Queue;
  import java.util.Set;
  import java.util.UUID;
-@@ -109,15 +110,39 @@ public class ServerConnector extends PacketHandler
+@@ -110,15 +111,39 @@ public class ServerConnector extends PacketHandler
              String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID();
 
              LoginResult profile = user.getPendingConnection().getLoginProfile();
@@ -67,7 +67,7 @@ index 76db3a71..3aacebe1 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 be65c3ad..6ca259cb 100644
+index 18b1690d..db103d32 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -170,8 +170,12 @@ public final class UserConnection implements ProxiedPlayer

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

@@ -1,4 +1,4 @@
-From ff46baa5671121531007c00dc684dc035a16dd8c Mon Sep 17 00:00:00 2001
+From dde015048a91f44a859189f590147b9244de3f80 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
@@ -9,7 +9,7 @@ Vanilla servers still error on negative/invalid packets.
 Original issue: https://github.com/WaterfallMC/Waterfall-Old/issues/11
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index 482341ef..76a3ddd0 100644
+index d79d5e5c..250e7620 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 @@ -18,6 +18,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -35,12 +35,12 @@ index 482341ef..76a3ddd0 100644
 +            DefinedPacket packet = prot.createPacket( packetId, protocolVersion, supportsForge );
              if ( packet != null )
              {
-                 packet.read( in, prot.getDirection(), protocolVersion );
+                 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 b6985fee..7f001b11 100644
+index 2eeca50b..9bd62ceb 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
-@@ -749,14 +749,23 @@ public enum Protocol
+@@ -751,14 +751,23 @@ public enum Protocol
              return protocol;
          }
 
@@ -66,10 +66,10 @@ index b6985fee..7f001b11 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 3aacebe1..a5c8de90 100644
+index 8a57c5a8..b856647f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -34,7 +34,9 @@ import net.md_5.bungee.forge.ForgeUtils;
+@@ -35,7 +35,9 @@ import net.md_5.bungee.forge.ForgeUtils;
  import net.md_5.bungee.netty.ChannelWrapper;
  import net.md_5.bungee.netty.HandlerBoss;
  import net.md_5.bungee.netty.PacketHandler;
@@ -79,7 +79,7 @@ index 3aacebe1..a5c8de90 100644
  import net.md_5.bungee.protocol.PacketWrapper;
  import net.md_5.bungee.protocol.Protocol;
  import net.md_5.bungee.protocol.ProtocolConstants;
-@@ -222,6 +224,12 @@ public class ServerConnector extends PacketHandler
+@@ -223,6 +225,12 @@ public class ServerConnector extends PacketHandler
      public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnection user, BungeeServerInfo target, ForgeServerHandler handshakeHandler, ServerConnection server, Login login) throws Exception
      {
          ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@@ -93,10 +93,10 @@ index 3aacebe1..a5c8de90 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 30cc36a4..c033118f 100644
+index 9a47f2ec..b768d54a 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
-@@ -338,6 +338,12 @@ public abstract class EntityMap
+@@ -340,6 +340,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
 

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

@@ -1,4 +1,4 @@
-From e8ea9698ec9af3d3ccc6be444b8a604aae29041a Mon Sep 17 00:00:00 2001
+From 74fc5e424568249619d3e514a21a7574978435e1 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 a5c8de90..59403052 100644
+index b856647f..7f1992df 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -499,6 +499,6 @@ public class ServerConnector extends PacketHandler
+@@ -503,6 +503,6 @@ public class ServerConnector extends PacketHandler
      @Override
      public String toString()
      {
@@ -19,10 +19,10 @@ index a5c8de90..59403052 100644
      }
  }
 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 23e7b6d8..88b0156c 100644
+index cee4c235..6c545f4c 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
-@@ -774,6 +774,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -777,6 +777,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,10 +31,10 @@ index 23e7b6d8..88b0156c 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 14a34f99..7e2d0c63 100644
+index 6562a641..9a6a305b 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
-@@ -728,20 +728,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -724,20 +724,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {

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

@@ -1,4 +1,4 @@
-From 1b52a13e4834482bb8b9daa3e54556fc2e612668 Mon Sep 17 00:00:00 2001
+From 3cebec2175678a2c7351368beffa2b8e09fb4025 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 7e2d0c63..9fd951be 100644
+index 9a6a305b..300d90f4 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
-@@ -301,10 +301,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -300,10 +300,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }