From 72dbe47c965c3018f71a2db287fbdc58dacb3f8f Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 16 May 2021 00:45:01 +0100
Subject: [PATCH] Updated Upstream (BungeeCord)

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

BungeeCord Changes:
4fc1a9e7 Dependency bump
---
 BungeeCord                                                | 2 +-
 ...Log4j2-for-logging-and-TerminalConsoleAppender-f.patch | 8 ++++----
 .../0038-Allow-plugins-to-use-SLF4J-for-logging.patch     | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index f0908b6..4fc1a9e 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit f0908b663f868ef5fe1f3ac8c81a29827cd6abe1
+Subproject commit 4fc1a9e77047e81008f2d6f760c4722b24b5b458
diff --git a/BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index 984b065..22473be 100644
--- a/BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From 94d4370d668dc6cd1056707e1f33ef26eda9f961 Mon Sep 17 00:00:00 2001
+From a29675723a6c2c520cf6c2079512f21621db28c0 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -233,7 +233,7 @@ index 00000000..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 2e9160a2..02480a20 100644
+index aa83cd3d..5e8499a7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,11 +56,12 @@
@@ -251,7 +251,7 @@ index 2e9160a2..02480a20 100644
      </modules>
  
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 645835d8..602b9a93 100644
+index eb23676e..177147ac 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -71,7 +71,7 @@
@@ -279,7 +279,7 @@ index 645835d8..602b9a93 100644
              <groupId>net.sf.jopt-simple</groupId>
              <artifactId>jopt-simple</artifactId>
 @@ -130,6 +131,25 @@
-             <version>1.6.2</version>
+             <version>1.7.0</version>
              <scope>compile</scope>
          </dependency>
 +        <!-- Waterfall start - Console improvements - bring back slf4j-->
diff --git a/BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch b/BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch
index cbc1a9f..44c664a 100644
--- a/BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -1,15 +1,15 @@
-From 4ea650d6cd29c5d8e526728b0f0e10eba6b6f5a2 Mon Sep 17 00:00:00 2001
+From ff1079e29631c994b5d65be0c1e3baf0b783bcfb 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 ee3ab347..ca1ed881 100644
+index 385a5cc2..7f6da3e8 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -76,5 +76,11 @@
-             <version>1.27</version>
+             <version>1.28</version>
              <scope>compile</scope>
          </dependency>
 +        <!-- Waterfall - Add SLF4J -->
@@ -56,5 +56,5 @@ index 84039f14..51187fd1 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.31.0
+2.31.1