Updade bungeecord and use their 1.10 support

BungeeCord

@@ -1 +1 @@
-Subproject commit ec48077dbe2c2c4164468b874d0cb8da949b4d4e
+Subproject commit e4cf010bdafea747aea8932679041c90268c4940

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 0b757873da44784e249694e2995a87dda5e2bc20 Mon Sep 17 00:00:00 2001
+From 5ebbae220ffc11ffe349d684135393689378750c Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
 Require Java 8
 
 diff --git a/api/pom.xml b/api/pom.xml
-index d9363b6..c71c1b1 100644
+index bd89a6b..b276c45 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,42 +4,42 @@
@@ -17,7 +17,7 @@ index d9363b6..c71c1b1 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -25,7 +25,7 @@ index d9363b6..c71c1b1 100644
 -    <artifactId>bungeecord-api</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-api</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-API</name>
@@ -66,7 +66,7 @@ index d9363b6..c71c1b1 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 0c02349..0785736 100644
+index 9eb904b..07cf1d0 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,19 +4,19 @@
@@ -77,7 +77,7 @@ index 0c02349..0785736 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -85,7 +85,7 @@ index 0c02349..0785736 100644
 -    <artifactId>bungeecord-bootstrap</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-bootstrap</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Bootstrap</name>
@@ -141,7 +141,7 @@ index b7cb81e..a4516ed 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index 0b447c1..7ff3224 100644
+index 79a774a..866b39a 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
 @@ -4,23 +4,24 @@
@@ -152,7 +152,7 @@ index 0b447c1..7ff3224 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -160,7 +160,7 @@ index 0b447c1..7ff3224 100644
 -    <artifactId>bungeecord-chat</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-chat</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Chat</name>
@@ -178,7 +178,7 @@ index 0b447c1..7ff3224 100644
  
      <dependencies>
 diff --git a/config/pom.xml b/config/pom.xml
-index 5c99e14..29e50dc 100644
+index c6d0a0b..8280c2d 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -189,7 +189,7 @@ index 5c99e14..29e50dc 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -197,7 +197,7 @@ index 5c99e14..29e50dc 100644
 -    <artifactId>bungeecord-config</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-config</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Config</name>
@@ -208,7 +208,7 @@ index 5c99e14..29e50dc 100644
      <dependencies>
          <dependency>
 diff --git a/event/pom.xml b/event/pom.xml
-index a5fee80..b6ef990 100644
+index 6688153..f9615cf 100644
 --- a/event/pom.xml
 +++ b/event/pom.xml
 @@ -4,17 +4,17 @@
@@ -219,7 +219,7 @@ index a5fee80..b6ef990 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -227,7 +227,7 @@ index a5fee80..b6ef990 100644
 -    <artifactId>bungeecord-event</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-event</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Event</name>
@@ -236,7 +236,7 @@ index a5fee80..b6ef990 100644
 +    <description>Generic java event dispatching API intended for use with Waterfall.</description>
  </project>
 diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
-index 1cc7fef..bc71a34 100644
+index 3156334..0c076f9 100644
 --- a/module/cmd-alert/pom.xml
 +++ b/module/cmd-alert/pom.xml
 @@ -4,14 +4,14 @@
@@ -247,7 +247,7 @@ index 1cc7fef..bc71a34 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -255,11 +255,11 @@ index 1cc7fef..bc71a34 100644
 -    <artifactId>bungeecord-module-cmd-alert</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-alert</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
-index 10b6a4f..a4e9f89 100644
+index 2a9b50f..2cf8d6d 100644
 --- a/module/cmd-find/pom.xml
 +++ b/module/cmd-find/pom.xml
 @@ -4,14 +4,14 @@
@@ -270,7 +270,7 @@ index 10b6a4f..a4e9f89 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -278,11 +278,11 @@ index 10b6a4f..a4e9f89 100644
 -    <artifactId>bungeecord-module-cmd-find</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-find</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
-index 774b694..6f4f4a7 100644
+index e68aa93..0300b5c 100644
 --- a/module/cmd-list/pom.xml
 +++ b/module/cmd-list/pom.xml
 @@ -4,14 +4,14 @@
@@ -293,7 +293,7 @@ index 774b694..6f4f4a7 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -301,11 +301,11 @@ index 774b694..6f4f4a7 100644
 -    <artifactId>bungeecord-module-cmd-list</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-list</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
-index 15d03fc..7481b49 100644
+index 7a08753..6d96f3a 100644
 --- a/module/cmd-send/pom.xml
 +++ b/module/cmd-send/pom.xml
 @@ -4,14 +4,14 @@
@@ -316,7 +316,7 @@ index 15d03fc..7481b49 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -324,11 +324,11 @@ index 15d03fc..7481b49 100644
 -    <artifactId>bungeecord-module-cmd-send</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-send</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
-index a72db68..1be3c11 100644
+index d3fb072..1c508e3 100644
 --- a/module/cmd-server/pom.xml
 +++ b/module/cmd-server/pom.xml
 @@ -4,14 +4,14 @@
@@ -339,7 +339,7 @@ index a72db68..1be3c11 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -347,11 +347,11 @@ index a72db68..1be3c11 100644
 -    <artifactId>bungeecord-module-cmd-server</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-server</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/pom.xml b/module/pom.xml
-index 3482d0d..100b8d7 100644
+index c59ac9d..19d50c6 100644
 --- a/module/pom.xml
 +++ b/module/pom.xml
 @@ -4,19 +4,19 @@
@@ -362,7 +362,7 @@ index 3482d0d..100b8d7 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -370,7 +370,7 @@ index 3482d0d..100b8d7 100644
 -    <artifactId>bungeecord-module</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord Modules</name>
@@ -392,7 +392,7 @@ index 3482d0d..100b8d7 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
-index bf5ae48..c0f55ba 100644
+index 7bd5521..93d2b4a 100644
 --- a/module/reconnect-yaml/pom.xml
 +++ b/module/reconnect-yaml/pom.xml
 @@ -4,14 +4,14 @@
@@ -403,7 +403,7 @@ index bf5ae48..c0f55ba 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -411,11 +411,11 @@ index bf5ae48..c0f55ba 100644
 -    <artifactId>bungeecord-module-reconnect-yaml</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-reconnect-yaml</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/native/pom.xml b/native/pom.xml
-index fb12cc4..5dd2e51 100644
+index a3bd632..a2b422c 100644
 --- a/native/pom.xml
 +++ b/native/pom.xml
 @@ -4,19 +4,19 @@
@@ -426,7 +426,7 @@ index fb12cc4..5dd2e51 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -434,7 +434,7 @@ index fb12cc4..5dd2e51 100644
 -    <artifactId>bungeecord-native</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-native</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Native</name>
@@ -445,24 +445,16 @@ index fb12cc4..5dd2e51 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index d8d7c02..b7639b0 100644
+index 299f6fa..2a78656 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3,24 +3,18 @@
+@@ -11,16 +11,18 @@
-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-     <modelVersion>4.0.0</modelVersion>
  
--    <parent>
+     <groupId>net.md-5</groupId>
--        <groupId>org.sonatype.oss</groupId>
+     <artifactId>bungeecord-parent</artifactId>
--        <artifactId>oss-parent</artifactId>
--        <version>9</version>
--    </parent>
--
--    <groupId>net.md-5</groupId>
--    <artifactId>bungeecord-parent</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-parent</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord-Parent</name>
@@ -481,7 +473,7 @@ index d8d7c02..b7639b0 100644
      </organization>
      <licenses>
          <license>
-@@ -32,7 +26,13 @@
+@@ -32,7 +34,13 @@
  
      <developers>
          <developer>
@@ -496,7 +488,7 @@ index d8d7c02..b7639b0 100644
          </developer>
      </developers>
  
-@@ -50,24 +50,36 @@
+@@ -50,24 +58,36 @@
      </modules>
  
      <scm>
@@ -541,7 +533,7 @@ index d8d7c02..b7639b0 100644
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
  
-@@ -116,36 +128,14 @@
+@@ -116,36 +136,14 @@
                      </execution>
                  </executions>
              </plugin>
@@ -581,7 +573,7 @@ index d8d7c02..b7639b0 100644
              </plugin>
          </plugins>
          <pluginManagement>
-@@ -180,4 +170,49 @@
+@@ -180,4 +178,49 @@
              </plugins>
          </pluginManagement>
      </build>
@@ -632,7 +624,7 @@ index d8d7c02..b7639b0 100644
 +    </profiles>
  </project>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 9e816ab..8b462f5 100644
+index bac4690..7a74143 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,24 +4,24 @@
@@ -643,7 +635,7 @@ index 9e816ab..8b462f5 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -651,7 +643,7 @@ index 9e816ab..8b462f5 100644
 -    <artifactId>bungeecord-protocol</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-protocol</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Protocol</name>
@@ -669,7 +661,7 @@ index 9e816ab..8b462f5 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 44ff3ff..3fe4937 100644
+index 700e327..9d792b5 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -680,7 +672,7 @@ index 44ff3ff..3fe4937 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -688,7 +680,7 @@ index 44ff3ff..3fe4937 100644
 -    <artifactId>bungeecord-proxy</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-proxy</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Proxy</name>
@@ -732,7 +724,7 @@ index 44ff3ff..3fe4937 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/query/pom.xml b/query/pom.xml
-index 81bd2c7..dbb2e81 100644
+index 8df9b12..1d76633 100644
 --- a/query/pom.xml
 +++ b/query/pom.xml
 @@ -4,19 +4,19 @@
@@ -743,7 +735,7 @@ index 81bd2c7..dbb2e81 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.9-SNAPSHOT</version>
+         <version>1.10-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -751,7 +743,7 @@ index 81bd2c7..dbb2e81 100644
 -    <artifactId>bungeecord-query</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-query</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.10-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Query</name>

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

@@ -1,4 +1,4 @@
-From a08dfab2aa4d78a8ecffb5278087fd4f846ea9bd Mon Sep 17 00:00:00 2001
+From 53e1968d08622b10c71a6b069a858d56b2566316 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
@@ -7,10 +7,10 @@ Don't access a ByteBuf's underlying array with ByteBuf.array()
   - ByteBuf.array() returns the underlying array storage, and does *not* return a view of the buffer as an array
 
 diff --git a/pom.xml b/pom.xml
-index badd9c4..eb5c2ca 100644
+index 2a78656..8a352a7 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -76,7 +76,7 @@
+@@ -84,7 +84,7 @@
  
      <properties>
          <build.number>unknown</build.number>
@@ -20,7 +20,7 @@ index badd9c4..eb5c2ca 100644
          <maven.compiler.source>1.8</maven.compiler.source>
          <maven.compiler.target>1.8</maven.compiler.target>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 8b462f5..ccee47e 100644
+index 7a74143..58e107e 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -32,6 +32,12 @@

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

@@ -1,4 +1,4 @@
-From 7dad680e878e890d1e947b7ef37ffa8db38c8459 Mon Sep 17 00:00:00 2001
+From b8216f418ad45f5f6ea8720c57a179fb28eaea26 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
@@ -37,10 +37,10 @@ index e7cb380..447eaae 100644
              {
                  packet.read( in, 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 2cbe052..08621b6 100644
+index d15d4ed..db2843f 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
-@@ -275,14 +275,18 @@ public enum Protocol
+@@ -278,14 +278,18 @@ public enum Protocol
              return protocol;
          }
  
@@ -101,10 +101,10 @@ index 9881b75..c88ab49 100644
      @Getter
      @NonNull
 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 02881ac..9ba9633 100644
+index 7eb48e0..f3c886a 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
-@@ -103,6 +103,12 @@ public abstract class EntityMap
+@@ -105,6 +105,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  

BungeeCord-Patches/0034-Better-debug-checks.patch

@@ -1,14 +1,14 @@
-From 33c44d523126e9db24258521218ebfa5be5c1431 Mon Sep 17 00:00:00 2001
+From 2048b1349a89191ead3891d548495185821e4d10 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 11:41:10 -0600
 Subject: [PATCH] Better debug checks
 
 
 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 08621b6..59aa5d4 100644
+index db2843f..4decbb2 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
-@@ -343,7 +343,7 @@ public enum Protocol
+@@ -346,7 +346,7 @@ public enum Protocol
              {
                  throw new BadPacketException( "Unsupported protocol version" );
              }

BungeeCord-Patches/0036-Add-support-for-Minecraft-1.10.patch

@@ -1,70 +0,0 @@
-From 1c564bb488c8c51dc801442fce67f76ff68208fe Mon Sep 17 00:00:00 2001
-From: joserobjr <jose.rob.jr@gmail.com>
-Date: Wed, 8 Jun 2016 11:32:15 -0700
-Subject: [PATCH] Add support for Minecraft 1.10
-
-
-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 59aa5d4..92d53e4 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
-@@ -129,7 +129,8 @@ public enum Protocol
-                     PlayerListHeaderFooter.class,
-                     map( ProtocolConstants.MINECRAFT_1_8, 0x47 ),
-                     map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
--                    map(ProtocolConstants.MINECRAFT_1_9_4, 0x47 )
-+                    map(ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
-+                    map(ProtocolConstants.MINECRAFT_1_10, 0x47 )
-             );
- 
-             TO_SERVER.registerPacket(
-@@ -258,7 +259,8 @@ public enum Protocol
-             ));
-             linkedProtocols.put( ProtocolConstants.MINECRAFT_1_9, Arrays.asList(ProtocolConstants.MINECRAFT_1_9_1,
-                 ProtocolConstants.MINECRAFT_1_9_2,
--                ProtocolConstants.MINECRAFT_1_9_4
-+                ProtocolConstants.MINECRAFT_1_9_4,
-+                ProtocolConstants.MINECRAFT_1_10
-             ));
-         }
- 
-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 2501512..80250de 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
-@@ -11,15 +11,18 @@ public class ProtocolConstants
-     public static final int MINECRAFT_1_9_1 = 108;
-     public static final int MINECRAFT_1_9_2 = 109;
-     public static final int MINECRAFT_1_9_4 = 110;
-+    public static final int MINECRAFT_1_10 = 210;
-     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
-             "1.8.x",
--            "1.9.x"
-+            "1.9.x",
-+            "1.10"
-     );
-     public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(ProtocolConstants.MINECRAFT_1_8,
-             ProtocolConstants.MINECRAFT_1_9,
-             ProtocolConstants.MINECRAFT_1_9_1,
-             ProtocolConstants.MINECRAFT_1_9_2,
--            ProtocolConstants.MINECRAFT_1_9_4
-+            ProtocolConstants.MINECRAFT_1_9_4,
-+            ProtocolConstants.MINECRAFT_1_10
-     );
- 
-     public enum Direction
-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 9ba9633..947beb3 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
-@@ -32,6 +32,7 @@ public abstract class EntityMap
-             case ProtocolConstants.MINECRAFT_1_9_2:
-                 return EntityMap_1_9.INSTANCE;
-             case ProtocolConstants.MINECRAFT_1_9_4:
-+            case ProtocolConstants.MINECRAFT_1_10:
-                 return EntityMap_1_9_4.INSTANCE;
-         }
-         throw new RuntimeException( "Version " + version + " has no entity map" );
--- 
-2.8.3
-

BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch

@@ -1,4 +1,4 @@
-From 4880a16aabd7bc71227ca550109d9b86397119a7 Mon Sep 17 00:00:00 2001
+From 5c2ffee089e1c972084acee916d54c5f8802bb1f Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Sun, 14 Feb 2016 15:54:40 +0000
 Subject: [PATCH] Allow the console to tab complete commands