From fdf62c92c593e7dc315aaea060261143d9bc58a2 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 26 Mar 2019 04:47:49 +0000
Subject: [PATCH] Updated Upstream (Waterfall)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Waterfall Changes:
c331e7f Report slow events in milliseconds
ae319ce Reuse existing ServerInfo object when reloading config
b346845 Use proper max length for serverbound chat packet
---
 Waterfall                                            |  2 +-
 .../0003-1.7.x-Protocol-Patch.patch                  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Waterfall b/Waterfall
index 8f8bdf5..c331e7f 160000
--- a/Waterfall
+++ b/Waterfall
@@ -1 +1 @@
-Subproject commit 8f8bdf58a9869bbddde471c68f512e5decfb73f6
+Subproject commit c331e7fd006fed785c8b289a5ae08ffdfc7e6081
diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
index dffc258..32e483b 100644
--- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
+++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
@@ -1,4 +1,4 @@
-From 723ceb3983d3b97b1775f8f12aae6d2226e21403 Mon Sep 17 00:00:00 2001
+From b403668d275c9c116b5bce735d3ab3eead60246b Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 10:31:04 -0500
 Subject: [PATCH] 1.7.x Protocol Patch
@@ -101,10 +101,10 @@ index 00000000..90064112
 +    }
 +}
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 28a3efde..6e811930 100644
+index d2d23b34..ae09f50c 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -206,6 +206,11 @@ public abstract class DefinedPacket
+@@ -234,6 +234,11 @@ public abstract class DefinedPacket
          read( buf );
      }
  
@@ -116,7 +116,7 @@ index 28a3efde..6e811930 100644
      public void write(ByteBuf buf)
      {
          throw new UnsupportedOperationException( "Packet must implement write method" );
-@@ -216,6 +221,11 @@ public abstract class DefinedPacket
+@@ -244,6 +249,11 @@ public abstract class DefinedPacket
          write( buf );
      }
  
@@ -502,7 +502,7 @@ index aef9fc37..f2c3b84f 100644
  
                  if ( in.readableBytes() < length )
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
-index 95ad39b7..1f78125a 100644
+index ce131cb9..7b988611 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
 @@ -1,6 +1,6 @@
@@ -537,7 +537,7 @@ index 95ad39b7..1f78125a 100644
      @Override
      public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
      {
-@@ -34,6 +42,14 @@ public class Chat extends DefinedPacket
+@@ -39,6 +47,14 @@ public class Chat extends DefinedPacket
          }
      }