Update upstream

BungeeCord

@@ -1 +1 @@
-Subproject commit 11c7b246e0e351edbfc5f2457a0f59082d85f552
+Subproject commit 504d3c0529e2014d5a1c469206db3bfd440829a7

BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch

@@ -1,4 +1,4 @@
-From f9ab276db558a01a10184f0ab69dbff535c45f2c Mon Sep 17 00:00:00 2001
+From 32fd17a35ab08aa17de792f6a7d4c498247f1cfa Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Upgrade to netty 4.1
@@ -37,18 +37,35 @@ index 7a74143..58e107e 100644
              <artifactId>trove4j</artifactId>
              <version>3.0.3</version>
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-index bbaef39..e1344b3 100644
+index bbaef39..a01df1f 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-@@ -9,6 +9,7 @@ import java.io.DataInputStream;
+@@ -1,18 +1,20 @@
+ package net.md_5.bungee.protocol.packet;
+ 
+ import com.google.common.base.Preconditions;
+-import net.md_5.bungee.protocol.DefinedPacket;
+ import io.netty.buffer.ByteBuf;
+-import java.io.ByteArrayInputStream;
+-import java.io.DataInput;
+-import java.io.DataInputStream;
++import io.netty.buffer.ByteBufUtil;
  import lombok.AllArgsConstructor;
  import lombok.Data;
  import lombok.EqualsAndHashCode;
-+import io.netty.buffer.ByteBufUtil;
  import lombok.NoArgsConstructor;
  import net.md_5.bungee.protocol.AbstractPacketHandler;
++import net.md_5.bungee.protocol.DefinedPacket;
  import net.md_5.bungee.protocol.ProtocolConstants;
-@@ -20,9 +21,22 @@ import net.md_5.bungee.protocol.ProtocolConstants;
+ 
++import java.io.ByteArrayInputStream;
++import java.io.DataInput;
++import java.io.DataInputStream;
++
+ @Data
+ @NoArgsConstructor
+ @AllArgsConstructor
+@@ -20,9 +22,22 @@ import net.md_5.bungee.protocol.ProtocolConstants;
  public class PluginMessage extends DefinedPacket
  {
  
@@ -72,27 +89,27 @@ index bbaef39..e1344b3 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 977b3de..e941803 100644
+index 976636a..e941803 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -199,7 +199,7 @@ public class ServerConnector extends PacketHandler
  
              ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
--            user.unsafe().sendPacket( new PluginMessage( "MC|Brand", DefinedPacket.readArray( brand ), handshakeHandler.isServerForge() ) );
+-            user.unsafe().sendPacket( new PluginMessage( "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) );
 +            user.unsafe().sendPacket( new PluginMessage( "MC|Brand", brand, handshakeHandler.isServerForge() ) );
              brand.release();
          } else
          {
 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 3daab36..2fcc7db 100644
+index 288d602..c7e75bf 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
-@@ -235,7 +235,7 @@ public class DownstreamBridge extends PacketHandler
-             brand.release();
+@@ -239,7 +239,7 @@ public class DownstreamBridge extends PacketHandler
+ 
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
--            pluginMessage.setData( DefinedPacket.readArray( brand ) );
+-            pluginMessage.setData( DefinedPacket.toArray( brand ) );
 +            pluginMessage.setData( brand );
              brand.release();
              // changes in the packet are ignored so we need to send it manually
@@ -115,5 +132,5 @@ index 621a06c..0ec3f81 100644
      {
          @Override
 -- 
-2.7.4 (Apple Git-66)
+2.8.2
 

BungeeCord-Patches/0023-Optional-server-list-ping-logging.patch

@@ -1,4 +1,4 @@
-From a94d77b1307b2bc3e49d71d50900291e2c0aaf8b Mon Sep 17 00:00:00 2001
+From b551cbf97c648845654e922bcf2444c9981acccd Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Optional server list ping logging.
@@ -73,10 +73,10 @@ index b6e6365..e327325 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 2fcc7db..fa57f28 100644
+index c7e75bf..a8e65fa 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
-@@ -503,6 +503,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -507,6 +507,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -122,7 +122,7 @@ index 3fe1d23..501d5ba 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 9f409fb..25e3e07 100644
+index 7b9678e..35e231d 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
 @@ -209,6 +209,6 @@ public class UpstreamBridge extends PacketHandler
@@ -134,5 +134,5 @@ index 9f409fb..25e3e07 100644
      }
  }
 -- 
-2.9.0
+2.8.2
 

BungeeCord-Patches/0037-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From fcedeac8bcc63478092a4963c159fe8b91bd310d Mon Sep 17 00:00:00 2001
+From 948e114f61cfb4eacb6e3205f99354e10340de29 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -75,10 +75,10 @@ index e327325..d16fa57 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 fa57f28..6463f75 100644
+index a8e65fa..4177ef5 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
-@@ -58,16 +58,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -59,16 +59,19 @@ public class DownstreamBridge extends PacketHandler
              return;
          }
  
@@ -104,7 +104,7 @@ index fa57f28..6463f75 100644
      }
  
      @Override
-@@ -82,7 +85,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -83,7 +86,19 @@ public class DownstreamBridge extends PacketHandler
  
          if ( !server.isObsolete() )
          {
@@ -125,7 +125,7 @@ index fa57f28..6463f75 100644
          }
  
          ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -453,7 +468,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -457,7 +472,7 @@ public class DownstreamBridge extends PacketHandler
          {
              def = null;
          }
@@ -135,5 +135,5 @@ index fa57f28..6463f75 100644
          {
              con.connectNow( event.getCancelServer() );
 -- 
-2.7.4 (Apple Git-66)
+2.8.2