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:
89069a36 #3823: Add client brand API
1279cca9 #3810: Use retainedSlice if possible in MinecraftDecoder
26433bf0 #3821: Fix race condition that leads to incorrect packet order

Author: linsaftw

BungeeCord

@@ -1,4 +1,4 @@
-From 29b9c5ae16cc50d746f8552df16a21b736fa9461 Mon Sep 17 00:00:00 2001
+From 2e82da30be2b841a49b88611772048d9b3bdb351 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
@@ -58,10 +58,10 @@ index 5583a1b3..3cd625b9 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 10f7ba99..9113a3fa 100644
+index 71470345..32cd0219 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
-@@ -327,7 +327,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -328,7 +328,7 @@ public class DownstreamBridge extends PacketHandler
 
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );

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

@@ -1,4 +1,4 @@
-From 4674760b916deb68fb27d17c65ed583e805fde26 Mon Sep 17 00:00:00 2001
+From 0e1022f1e1c7d0194a46f1942c9b9d0ff5515712 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
@@ -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 e4c92ef7..e684ba09 100644
+index fa1f2bef..cba35899 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
-@@ -797,7 +797,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -800,7 +800,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {

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

@@ -1,4 +1,4 @@
-From 3b45c584532a46595650c4301886244022b185de Mon Sep 17 00:00:00 2001
+From bc7defd853a8c80a3d959606109eb41ea805c4e8 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@@ -8,18 +8,18 @@ Subject: [PATCH] Micro-optimizations
 - Don't create a data input stream for every plugin message we get from servers
 
 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 9113a3fa..682e33be 100644
+index 32cd0219..30664771 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
-@@ -309,7 +309,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -310,7 +310,6 @@ public class DownstreamBridge extends PacketHandler
      @SuppressWarnings("checkstyle:avoidnestedblocks")
      public void handle(PluginMessage pluginMessage) throws Exception
      {
 -        DataInput in = pluginMessage.getStream();
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
 
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -336,6 +335,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -337,6 +336,7 @@ public class DownstreamBridge extends PacketHandler
 
          if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) )
          {

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From caf1b27027c4eb875155e55696002d7fde32b7f0 Mon Sep 17 00:00:00 2001
+From 625b7cdf886ab66523854253f2292ea3c9784665 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -9,25 +9,28 @@ 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 d79d5e5c..250e7620 100644
+index abcb53bb..1c21a330 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>
-     private final boolean server;
+@@ -14,7 +14,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
+ 
+     public MinecraftDecoder(Protocol protocol, boolean server, int protocolVersion)
+     {
+-        this( protocol, server, protocolVersion, shouldCopyBuffer( protocol, protocolVersion ) );
++        this( protocol, server, protocolVersion, shouldCopyBuffer( protocol, protocolVersion ), false );
+     }
+ 
+     @Getter
+@@ -23,6 +23,8 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
      @Setter
      private int protocolVersion;
+     private boolean copyBuffer;
 +    @Setter
 +    private boolean supportsForge = false;
-+
-+    public MinecraftDecoder(Protocol protocol, boolean server, int protocolVersion) {
-+        this.protocol = protocol;
-+        this.server = server;
-+        this.protocolVersion = protocolVersion;
-+    }
 
      @Override
      protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
-@@ -36,7 +44,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
+@@ -40,7 +42,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
          {
              int packetId = DefinedPacket.readVarInt( in );
 
@@ -83,10 +86,10 @@ index c0487684..2b9487dc 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 c8fdb2e9..1bf73fd2 100644
+index eab5a947..1a27d786 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
-@@ -349,6 +349,12 @@ public abstract class EntityMap
+@@ -337,6 +337,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
 

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

@@ -1,4 +1,4 @@
-From 7c3811f556c096bb26e777ee55bc51ee87d1cbd9 Mon Sep 17 00:00:00 2001
+From 67afd179c1a84dd0d4bca0f7bf9bf693ddef1f65 Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -73,10 +73,10 @@ index 741ebfde..91743f01 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 49967de9..0961c6e6 100644
+index 93f57bc1..18e5065e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -52,6 +52,8 @@ public class UpstreamBridge extends PacketHandler
+@@ -51,6 +51,8 @@ public class UpstreamBridge extends PacketHandler
      private final ProxyServer bungee;
      private final UserConnection con;
 
@@ -85,7 +85,7 @@ index 49967de9..0961c6e6 100644
      public UpstreamBridge(ProxyServer bungee, UserConnection con)
      {
          this.bungee = bungee;
-@@ -232,6 +234,20 @@ public class UpstreamBridge extends PacketHandler
+@@ -231,6 +233,20 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public void handle(TabCompleteRequest tabComplete) throws Exception
      {
@@ -107,5 +107,5 @@ index 49967de9..0961c6e6 100644
          boolean isRegisteredCommand = false;
          boolean isCommand = tabComplete.getCursor().startsWith( "/" );
 -- 
-2.47.1
+2.43.0
 

BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch

@@ -1,4 +1,4 @@
-From b79c04a891cdd4371e94fca186e69d825a5b8f82 Mon Sep 17 00:00:00 2001
+From e8070eab3ab332dff637eb56b172f4cdabaece6f Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -19,10 +19,10 @@ index 2b9487dc..26abaa80 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 682e33be..ea693300 100644
+index 30664771..080ca279 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
-@@ -804,6 +804,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -815,6 +815,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,10 +31,10 @@ index 682e33be..ea693300 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 e684ba09..7283ff26 100644
+index cba35899..70850b4f 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
-@@ -803,20 +803,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -806,20 +806,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -57,10 +57,10 @@ index e684ba09..7283ff26 100644
 
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 580b4d70..a6176702 100644
+index 18e5065e..459aff6d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -404,6 +404,6 @@ public class UpstreamBridge extends PacketHandler
+@@ -397,6 +397,6 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public String toString()
      {

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

@@ -1,4 +1,4 @@
-From 32957156db178745864b7da27f459646501f5790 Mon Sep 17 00:00:00 2001
+From d1cdc6d9c5cfba536b694f6596100c850f0a9df3 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 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 7283ff26..041c3103 100644
+index 70850b4f..217030d2 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
-@@ -324,10 +324,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -327,10 +327,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          }
      }
 

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

@@ -1,4 +1,4 @@
-From a3e2e1537d0fdd51e62d084d64d67a2460ff813f Mon Sep 17 00:00:00 2001
+From 5496972137855bac826642df02a03a771d8bbb2a Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -81,10 +81,10 @@ index 26abaa80..44a73622 100644
          {
              // Pre cancel the event if we are going to try another server
 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 ea693300..3e211afa 100644
+index 080ca279..33808905 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
-@@ -647,10 +647,14 @@ public class DownstreamBridge extends PacketHandler
+@@ -648,10 +648,14 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );

BungeeCord-Patches/0024-Improve-ServerKickEvent.patch

@@ -1,11 +1,11 @@
-From 26e5efd5327231309bb9dcfc080e59baec9d6767 Mon Sep 17 00:00:00 2001
+From 7198a5ec6f032bf68e7974c6eeb59b97b487a2aa Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 4 Aug 2016 19:30:49 -0700
 Subject: [PATCH] Dump the raw hex of a packet on a decoding error
 
 
 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 250e7620..2207c3ff 100644
+index 1c21a330..2cfc5109 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
 @@ -1,7 +1,9 @@
@@ -18,10 +18,10 @@ index 250e7620..2207c3ff 100644
  import io.netty.handler.codec.MessageToMessageDecoder;
  import java.util.List;
  import lombok.AllArgsConstructor;
-@@ -40,13 +42,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
-         Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
-         ByteBuf slice = in.copy(); // Can't slice this one due to EntityMap :(
+@@ -38,13 +40,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
 
+         Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
+         ByteBuf slice = ( copyBuffer ) ? in.copy() : in.retainedSlice();
 +        Object packetTypeInfo = null;
          try
          {
@@ -35,7 +35,7 @@ index 250e7620..2207c3ff 100644
                  packet.read( in, protocol, prot.getDirection(), protocolVersion );
 
                  if ( in.isReadable() )
-@@ -60,6 +65,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
+@@ -58,6 +63,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
 
              out.add( new PacketWrapper( packet, slice, protocol ) );
              slice = null;
@@ -53,5 +53,5 @@ index 250e7620..2207c3ff 100644
          {
              if ( slice != null )
 -- 
-2.44.0
+2.43.0