From 9279d02f841ee11824eef40b6aa6cbed2e6b8bf4 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 12 May 2021 16:41:35 +0100
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:
eb03f06 Updated Upstream (BungeeCord)
---
 Waterfall                                        |  2 +-
 .../0003-1.7.x-Protocol-Patch.patch              | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Waterfall b/Waterfall
index 8fdb6be..eb03f06 160000
--- a/Waterfall
+++ b/Waterfall
@@ -1 +1 @@
-Subproject commit 8fdb6be79589080b3ebe1f6587892de9625ac55f
+Subproject commit eb03f0627de7b37b4d9b6f7f796ccb5e8d4fdd0a
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 4beed3e..995746e 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 bc92a3b1a1f14ed5b31b8baa82e17b4ede1d8bdf Mon Sep 17 00:00:00 2001
+From 6f9d46148349b909fe4a49f5d65ca6d9f287e6cf 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
@@ -1439,10 +1439,10 @@ index 2d9c0cda5..a4c255757 100644
                  throw CancelSendSignal.INSTANCE;
              }
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index 7ec119ea0..986a9d052 100644
+index 01075a85e..96df01757 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -193,6 +193,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -196,6 +196,7 @@ public final class UserConnection implements ProxiedPlayer
      public void setDisplayName(String name)
      {
          Preconditions.checkNotNull( name, "displayName" );
@@ -1450,7 +1450,7 @@ index 7ec119ea0..986a9d052 100644
          displayName = name;
      }
  
-@@ -497,7 +498,8 @@ public final class UserConnection implements ProxiedPlayer
+@@ -500,7 +501,8 @@ public final class UserConnection implements ProxiedPlayer
          // transform score components
          message = ChatComponentTransformer.getInstance().transform( this, true, message );
  
@@ -1460,7 +1460,7 @@ index 7ec119ea0..986a9d052 100644
          {
              // Versions older than 1.11 cannot send the Action bar with the new JSON formattings
              // Fix by converting to a legacy message, see https://bugs.mojang.com/browse/MC-119145
-@@ -693,6 +695,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -696,6 +698,7 @@ public final class UserConnection implements ProxiedPlayer
      @Override
      public void setTabHeader(BaseComponent header, BaseComponent footer)
      {
@@ -1468,7 +1468,7 @@ index 7ec119ea0..986a9d052 100644
          header = ChatComponentTransformer.getInstance().transform( this, true, header )[0];
          footer = ChatComponentTransformer.getInstance().transform( this, true, footer )[0];
  
-@@ -705,6 +708,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -708,6 +711,7 @@ public final class UserConnection implements ProxiedPlayer
      @Override
      public void setTabHeader(BaseComponent[] header, BaseComponent[] footer)
      {
@@ -1476,7 +1476,7 @@ index 7ec119ea0..986a9d052 100644
          header = ChatComponentTransformer.getInstance().transform( this, true, header );
          footer = ChatComponentTransformer.getInstance().transform( this, true, footer );
  
-@@ -734,6 +738,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -737,6 +741,7 @@ public final class UserConnection implements ProxiedPlayer
  
      public void setCompressionThreshold(int compressionThreshold)
      {
@@ -1637,7 +1637,7 @@ index 4d7b1b23e..ad3bdee56 100644
              con.getServer().disconnect( "Quitting" );
          }
 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 db93d8835..a3a12e19b 100644
+index db5210d16..cd0bc5a9b 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
 @@ -35,6 +35,10 @@ public abstract class EntityMap