From a9ca533e3f642233a65c686bb9102adff81cf6c0 Mon Sep 17 00:00:00 2001
From: Luccboy <58391278+Luccboy@users.noreply.github.com>
Date: Tue, 6 Jul 2021 22:13:09 +0200
Subject: [PATCH] Updated Upstream (Waterfall)

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

Waterfall Changes:
9dd430a Updated Upstream (BungeeCord) (#667)
---
 Waterfall                                                 | 2 +-
 .../0022-Fix-ByteBuf-memory-leaks.patch                   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Waterfall b/Waterfall
index a5c78a9..9dd430a 160000
--- a/Waterfall
+++ b/Waterfall
@@ -1 +1 @@
-Subproject commit a5c78a961e091417914a7723d5d840c17b92f52e
+Subproject commit 9dd430af6d1809020fc95637f86ba21340ccada1
diff --git a/Waterfall-Proxy-Patches/0022-Fix-ByteBuf-memory-leaks.patch b/Waterfall-Proxy-Patches/0022-Fix-ByteBuf-memory-leaks.patch
index e326aba..bcfa09a 100644
--- a/Waterfall-Proxy-Patches/0022-Fix-ByteBuf-memory-leaks.patch
+++ b/Waterfall-Proxy-Patches/0022-Fix-ByteBuf-memory-leaks.patch
@@ -1,4 +1,4 @@
-From 6c410c530ba6004e34032a1460c644808dd230b1 Mon Sep 17 00:00:00 2001
+From fb2700e20203d8aeb36b8f64b688df0b264cb9dc Mon Sep 17 00:00:00 2001
 From: linsaftw <linsaftw@users.noreply.github.com>
 Date: Sat, 20 Mar 2021 12:36:25 -0300
 Subject: [PATCH] Fix ByteBuf memory leaks
@@ -64,10 +64,10 @@ index 9e180c30..40c016d6 100644
              con.unsafe().sendPacket( pluginMessage );
              throw CancelSendSignal.INSTANCE;
 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 13456b34..6d4b96cd 100644
+index 09df5a93..67ef2cb4 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
-@@ -141,11 +141,15 @@ public abstract class EntityMap
+@@ -142,11 +142,15 @@ public abstract class EntityMap
          if ( readId == oldId || readId == newId )
          {
              ByteBuf data = packet.copy();
@@ -123,5 +123,5 @@ index cefa0206..8d4439ab 100644
      }
  
 -- 
-2.31.1.windows.1
+2.32.0.windows.1