From ff371989bf22b7ccb2df4e022b134a26db73c032 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 24 Oct 2022 15:38:17 +0100
Subject: [PATCH] Updated Upstream (BungeeCord)

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

BungeeCord Changes:
2d369e89 Update SnakeYAML version
02548c4b Update Netty/SnakeYAML version
---
 BungeeCord                                    |  2 +-
 ...low-plugins-to-use-SLF4J-for-logging.patch | 10 ++++-----
 BungeeCord-Patches/0066-Bump-netty.patch      | 22 -------------------
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 BungeeCord-Patches/0066-Bump-netty.patch

diff --git a/BungeeCord b/BungeeCord
index 71990e3..2d369e8 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 71990e3ccc16e65f90bc76b38648f9a1d3e9cedb
+Subproject commit 2d369e894546b3c180ecf931317c6fabff3149c0
diff --git a/BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch b/BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch
index 2a4fca5..2a27b06 100644
--- a/BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -1,15 +1,15 @@
-From f2b26a8fb95ca8e8cd68638c0c26883f5af6af48 Mon Sep 17 00:00:00 2001
+From f1adfb64276cd2b876c75262bde597eae55ab5a5 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
 
 
 diff --git a/api/pom.xml b/api/pom.xml
-index 4c87a36e..379b6023 100644
+index 863c353e..5d21fd99 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -76,5 +76,11 @@
-             <version>1.30</version>
+             <version>1.33</version>
              <scope>compile</scope>
          </dependency>
 +        <!-- Waterfall - Add SLF4J -->
@@ -39,7 +39,7 @@ index 9660234d..3d1e9a3a 100644
       * Called when the plugin has just been loaded. Most of the proxy will not
       * be initialized, so only use it for registering
 diff --git a/log4j/pom.xml b/log4j/pom.xml
-index f2623ebe..39e2fa42 100644
+index 44bf7f91..fb091698 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
 @@ -38,6 +38,12 @@
@@ -56,5 +56,5 @@ index f2623ebe..39e2fa42 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.33.0
+2.38.1
 
diff --git a/BungeeCord-Patches/0066-Bump-netty.patch b/BungeeCord-Patches/0066-Bump-netty.patch
deleted file mode 100644
index 3d33613..0000000
--- a/BungeeCord-Patches/0066-Bump-netty.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 18e5e71320ba43f2c11d65b6ade5f31e57b62bca Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 28 Aug 2022 00:35:57 +0100
-Subject: [PATCH] Bump netty
-
-
-diff --git a/pom.xml b/pom.xml
-index 2b544c23..6810b9cc 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -89,7 +89,7 @@
-     <properties>
-         <build.number>unknown</build.number>
-         <lombok.version>1.18.22</lombok.version>
--        <netty.version>4.1.77.Final</netty.version>
-+        <netty.version>4.1.80.Final</netty.version> <!-- Waterfall - bump -->
-         <maven.compiler.source>1.8</maven.compiler.source>
-         <maven.compiler.target>1.8</maven.compiler.target>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--- 
-2.37.2
-