updated upstream (BungeeCord)

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 058ce1cb0fc175ecb9e9ac294d2146683a7036b1 Mon Sep 17 00:00:00 2001
+From 76b0f26f9bda2c55145f4269a088c4fa6bdd7a4a Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index 71c4ce27..7db6020f 100644
+index 9a9bc506..b8c60c9f 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
 @@ -4,19 +4,19 @@
@@ -175,7 +175,7 @@ index 71c4ce27..7db6020f 100644
      <dependencies>
          <dependency>
 diff --git a/config/pom.xml b/config/pom.xml
-index 4b94f112..d245a60b 100644
+index 58f0b7ca..10d1d4ca 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -514,7 +514,7 @@ index bd3a8ab8..49347e1d 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 7335e8b7..b882440f 100644
+index fb8077b8..4a4287eb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -625,7 +625,7 @@ index 7335e8b7..b882440f 100644
 +             <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
-                 <version>3.3.1</version>
+                 <version>3.6.0</version>
 @@ -179,6 +196,7 @@
                      </dependency>
                  </dependencies>
@@ -634,7 +634,7 @@ index 7335e8b7..b882440f 100644
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -291,6 +309,15 @@
+@@ -300,6 +318,15 @@
                                  </goals>
                              </execution>
                          </executions>
@@ -650,7 +650,7 @@ index 7335e8b7..b882440f 100644
                      </plugin>
                      <plugin>
                          <groupId>org.projectlombok</groupId>
-@@ -339,6 +366,7 @@
+@@ -348,6 +375,7 @@
                                      <!-- lombok does not add @return or @param which causes warnings, so ignore -->
                                      <doclint>none</doclint>
                                      <sourcepath>${project.build.directory}/delombok</sourcepath>
@@ -848,5 +848,5 @@ index 5c611d8c..8860998c 100644
 
      <properties>
 -- 
-2.39.3 (Apple Git-146)
+2.47.1.windows.2
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,14 +1,14 @@
-From 34fdda895db367f225f49d94a55a8f04aa89842f Mon Sep 17 00:00:00 2001
+From 928238076c799877724e19af01698e94fd5e1c38 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 b3d1c2bb..ad9aa920 100644
+index 1d0de625..fb356a66 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
-@@ -125,6 +125,16 @@ public class ProtocolConstants
+@@ -126,6 +126,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index b3d1c2bb..ad9aa920 100644
      {
 
 -- 
-2.47.1
+2.47.1.windows.2
 

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

@@ -1,12 +1,12 @@
-From b212fd1b0a9b781f13e21b4c1e9c0432640baaf1 Mon Sep 17 00:00:00 2001
+From a5d1ebab518172129f7ae3aef9c78089bf78b296 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
 
 It returns the underlying array storage, and does *not* return a view of the buffer as an array
 
 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 70b292f0..91f71c09 100644
+index 1a7d8512..8f500382 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
 @@ -3,6 +3,7 @@ package net.md_5.bungee.protocol.packet;
@@ -17,7 +17,7 @@ index 70b292f0..91f71c09 100644
  import java.io.ByteArrayInputStream;
  import java.io.DataInput;
  import java.io.DataInputStream;
-@@ -47,10 +48,23 @@ public class PluginMessage extends DefinedPacket
+@@ -49,10 +50,23 @@ public class PluginMessage extends DefinedPacket
              return "legacy:" + tag.toLowerCase( Locale.ROOT );
          }
      };
@@ -56,10 +56,10 @@ index b58a01c6..c7637608 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 d518d05f..21019091 100644
+index 64e9a764..f5b3f7a8 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
-@@ -325,7 +325,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 );
@@ -82,5 +82,5 @@ index 2446f489..380b6012 100644
      {
          @Override
 -- 
-2.47.0
+2.47.1.windows.2
 

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

@@ -1,4 +1,4 @@
-From 4ef93b430b7240ea845535477c4d3ac49f906088 Mon Sep 17 00:00:00 2001
+From 8ef76fafc7299276974eaafcb05ba2009c6491f9 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 224f231b..b7d7e71a 100644
+index 047e7129..4ec85bda 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
-@@ -823,7 +823,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -798,7 +798,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -263,5 +263,5 @@ index 224f231b..b7d7e71a 100644
 
      @Override
 -- 
-2.47.0
+2.47.1.windows.2
 

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 1aa3fbcfe8aaf58084220dfc5142cff546a0b6c2 Mon Sep 17 00:00:00 2001
+From 7cecf58bf32a07fd33157d1014bc00e12b6fc22b Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@@ -8,25 +8,25 @@ 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 21019091..b501f7bd 100644
+index f5b3f7a8..137d949e 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
-@@ -307,7 +307,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() )
-@@ -334,6 +333,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -337,6 +336,7 @@ public class DownstreamBridge extends PacketHandler
 
-         if ( pluginMessage.getTag().equals( "BungeeCord" ) )
+         if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) )
          {
 +            DataInput in = pluginMessage.getStream();
              ByteArrayDataOutput out = ByteStreams.newDataOutput();
              String subChannel = in.readUTF();
 
 -- 
-2.47.0
+2.47.1.windows.2
 

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

@@ -1,4 +1,4 @@
-From d68066bbfc93431041ec0df01945032b0ae69f70 Mon Sep 17 00:00:00 2001
+From 7636e8a2ea85640748b814f5121565b5acd054b9 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 8aa57ed4..7a26c419 100644
+index 40fdb868..34be8c00 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
-@@ -917,14 +917,23 @@ public enum Protocol
+@@ -945,14 +945,23 @@ public enum Protocol
              return protocol;
          }
 
@@ -83,10 +83,10 @@ index 824166e5..b02121af 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 206bc8d2..fab7e9b9 100644
+index c8fdb2e9..1bf73fd2 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
-@@ -347,6 +347,12 @@ public abstract class EntityMap
+@@ -349,6 +349,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
 
@@ -100,5 +100,5 @@ index 206bc8d2..fab7e9b9 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.47.1
+2.47.1.windows.2
 

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

@@ -1,4 +1,4 @@
-From 67530bdaa956440c3c8a7f8a9b37e0b6a1ac62e5 Mon Sep 17 00:00:00 2001
+From 346da2f06a2a72f5d7a360e1bbc799c2b496d530 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
@@ -19,10 +19,10 @@ index b02121af..6f49765f 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 b501f7bd..1c075a9f 100644
+index 137d949e..3c286239 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
-@@ -802,6 +802,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -805,6 +805,6 @@ public class DownstreamBridge 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 1679e6ab..aaae7afa 100644
+index 4ec85bda..c09f59eb 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
-@@ -829,20 +829,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -804,20 +804,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -57,7 +57,7 @@ index 1679e6ab..aaae7afa 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 0961c6e6..e61fcc88 100644
+index e7d46d53..ba0ef69d 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
@@ -69,5 +69,5 @@ index 0961c6e6..e61fcc88 100644
      }
  }
 -- 
-2.47.1
+2.47.1.windows.2
 

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

@@ -1,4 +1,4 @@
-From 6b92feb2426c2bd0866b6ee3aa7fc175ecea40ca Mon Sep 17 00:00:00 2001
+From da17763410befea67be74f9adbaf8538578c12fa 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 72f6111e..fd577788 100644
+index c09f59eb..b8b7102c 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
-@@ -333,10 +333,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -329,10 +329,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
 
@@ -29,5 +29,5 @@ index 72f6111e..fd577788 100644
          disconnect( "" );
      }
 -- 
-2.47.0
+2.47.1.windows.2