From ea2c1098646642d1542f573111c74b8990602fc6 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sun, 4 Dec 2016 17:31:55 +0000
Subject: [PATCH] Make waterfall-super the parent of waterfall-parent

---
 BungeeCord-Patches/0001-POM-Changes.patch     | 25 +++++++++++++------
 ...access-a-ByteBuf-s-underlying-array.patch} | 13 ++++------
 2 files changed, 22 insertions(+), 16 deletions(-)
 rename BungeeCord-Patches/{0008-Improve-Netty-update.patch => 0008-Don-t-access-a-ByteBuf-s-underlying-array.patch} (92%)

diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 6e3b715..1582ae3 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 9c75ec25896ccbd216591fcfa52de66d67cbfe36 Mon Sep 17 00:00:00 2001
+From ba49e7fc3950ef11d37c43ccfe77bf8286d7f942 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
@@ -492,11 +492,20 @@ index 940d257..18861da 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 7f9564c..10ddfab 100644
+index 7f9564c..569c424 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -9,18 +9,18 @@
-         <version>9</version>
+@@ -4,23 +4,24 @@
+     <modelVersion>4.0.0</modelVersion>
+ 
+     <parent>
+-        <groupId>org.sonatype.oss</groupId>
+-        <artifactId>oss-parent</artifactId>
+-        <version>9</version>
++        <groupId>io.github.waterfallmc</groupId>
++        <artifactId>waterfall-super</artifactId>
++        <version>dev-SNAPSHOT</version>
++        <relativePath>../pom.xml</relativePath>
      </parent>
  
 -    <groupId>net.md-5</groupId>
@@ -522,7 +531,7 @@ index 7f9564c..10ddfab 100644
      </organization>
      <licenses>
          <license>
-@@ -32,7 +32,19 @@
+@@ -32,7 +33,19 @@
  
      <developers>
          <developer>
@@ -543,7 +552,7 @@ index 7f9564c..10ddfab 100644
          </developer>
      </developers>
  
-@@ -51,24 +63,36 @@
+@@ -51,24 +64,36 @@
      </modules>
  
      <scm>
@@ -587,7 +596,7 @@ index 7f9564c..10ddfab 100644
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
  
-@@ -117,36 +141,14 @@
+@@ -117,36 +142,14 @@
                      </execution>
                  </executions>
              </plugin>
@@ -627,7 +636,7 @@ index 7f9564c..10ddfab 100644
              </plugin>
          </plugins>
          <pluginManagement>
-@@ -181,4 +183,49 @@
+@@ -181,4 +184,49 @@
              </plugins>
          </pluginManagement>
      </build>
diff --git a/BungeeCord-Patches/0008-Improve-Netty-update.patch b/BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
similarity index 92%
rename from BungeeCord-Patches/0008-Improve-Netty-update.patch
rename to BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
index 93da27e..f00fb58 100644
--- a/BungeeCord-Patches/0008-Improve-Netty-update.patch
+++ b/BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
@@ -1,12 +1,9 @@
-From 21d3ffc5849abc92929e2e769cb51e392975cbf7 Mon Sep 17 00:00:00 2001
+From 7c409c20042b2ea819c4b08165d8b4387384981f Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
-Subject: [PATCH] Improve Netty update
+Subject: [PATCH] Don't access a ByteBuf's underlying array
 
-ORIGINAL PATCH - Upgrade to netty 4.1
-
-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
+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 6dcdece..e67773d 100644
@@ -59,7 +56,7 @@ index 2014b0c..6b77d90 100644
  
              user.setDimension( login.getDimension() );
 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 22f1045..cd680f5 100644
+index c2dd942..c0a5061 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
 @@ -240,7 +240,7 @@ public class DownstreamBridge extends PacketHandler
@@ -89,5 +86,5 @@ index 7fd2ff7..a70a215 100644
      {
          @Override
 -- 
-2.7.4 (Apple Git-66)
+2.10.0