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:
830ee8f2 #3061: Continue to fallback to underlying URLClassLoader
425dd451 Override classloader close method for completeness
6a039de8 Add preview of automatic library support

BungeeCord

@@ -1 +1 @@
-Subproject commit 8d783aa172830f212baa197b6b0c1c3d5f1237d1
+Subproject commit 830ee8f27d47400d17915bf546fc85540dbe5180

BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

@@ -1,14 +1,14 @@
-From 7d64d748a2d40d627fe51b3123f00f967e32491f Mon Sep 17 00:00:00 2001
+From 1eafcaf9e03e0a2280b2f86b51e1eb00b08d4c5e Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 18 Jul 2018 20:23:03 +0300
 Subject: [PATCH] Copy license files into jar
 
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 7ff2f551..485c3f3c 100644
+index d1700424..f5610a53 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -99,6 +99,20 @@
+@@ -124,6 +124,20 @@
                  <directory>src/main/resources</directory>
                  <filtering>true</filtering>
              </resource>
@@ -30,5 +30,5 @@ index 7ff2f551..485c3f3c 100644
      </build>
  </project>
 -- 
-2.27.0
+2.31.0
 

BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,4 +1,4 @@
-From 4c550fb65f1bcf822f8f391688d7a669a51aab28 Mon Sep 17 00:00:00 2001
+From a2c4daae4702f17b028c5225ae0bf5cabe696e9d 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 337a87da..bfec1abc 100644
+index 12c285f2..56bb4a7a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -245,7 +245,7 @@ index 337a87da..bfec1abc 100644
          <module>protocol</module>
          <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 168eab5c..7a872a54 100644
+index 97cb9e03..fef13cbf 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -65,7 +65,7 @@
@@ -257,11 +257,10 @@ index 168eab5c..7a872a54 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -99,6 +99,20 @@
-             <version>5.1.49</version>
-             <scope>runtime</scope>
+@@ -124,6 +124,19 @@
+             <version>1.7.30</version>
+             <scope>compile</scope>
          </dependency>
-+
 +        <!-- Waterfall start - Console improvements -->
 +        <dependency>
 +            <groupId>net.minecrell</groupId>
@@ -458,5 +457,5 @@ index 10366c88..8c5cc949 100644
          }
  
 -- 
-2.30.1
+2.31.0
 

BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,14 +1,14 @@
-From 3d5a4ae38173de11134fe922a4fd2cb76e4d90bf Mon Sep 17 00:00:00 2001
+From 4ea650d6cd29c5d8e526728b0f0e10eba6b6f5a2 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 0eb61e1d..c2b55587 100644
+index ee3ab347..ca1ed881 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
-@@ -55,5 +55,11 @@
+@@ -76,5 +76,11 @@
              <version>1.27</version>
              <scope>compile</scope>
          </dependency>
@@ -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 b099b20c..8baf329b 100644
+index 84039f14..51187fd1 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
 @@ -38,6 +38,12 @@
@@ -56,5 +56,5 @@ index b099b20c..8baf329b 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.25.1
+2.31.0
 

BungeeCord-Patches/0040-Add-console-command-completion.patch

@@ -1,4 +1,4 @@
-From 466859125a1f07b0fb151773728af30316d921da Mon Sep 17 00:00:00 2001
+From 581a41cd927ceea9cc783770ef6ea38864e5cffc Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion
@@ -7,10 +7,10 @@ Register command completer for JLine to complete command names and
 command arguments (if supported).
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index e7cd8a27..70d3736b 100644
+index c122cad9..4180c995 100644
 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-@@ -205,6 +205,41 @@ public final class PluginManager
+@@ -220,6 +220,41 @@ public final class PluginManager
          return true;
      }
  
@@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
      }
  
 -- 
-2.26.1
+2.31.0
 

BungeeCord-Patches/0054-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From 7840aa368f6f900a61b568be4ac35637a6c4ed07 Mon Sep 17 00:00:00 2001
+From a570cc8c9e2ad578c6fa489b745c98220c33de96 Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Wed, 22 Apr 2020 14:00:44 +1000
 Subject: [PATCH] Add exception reporting event
@@ -446,10 +446,10 @@ index 00000000..5bf57ec1
 +    }
 +}
 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index 70d3736b..431d4d6f 100644
+index 4180c995..90031156 100644
 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-@@ -24,6 +24,11 @@ import java.util.Stack;
+@@ -26,6 +26,11 @@ import java.util.Stack;
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  import java.util.logging.Level;
@@ -461,7 +461,7 @@ index 70d3736b..431d4d6f 100644
  import lombok.RequiredArgsConstructor;
  import net.md_5.bungee.api.ChatColor;
  import net.md_5.bungee.api.CommandSender;
-@@ -31,6 +36,7 @@ import net.md_5.bungee.api.ProxyServer;
+@@ -33,6 +38,7 @@ import net.md_5.bungee.api.ProxyServer;
  import net.md_5.bungee.api.connection.ProxiedPlayer;
  import net.md_5.bungee.event.EventBus;
  import net.md_5.bungee.event.EventHandler;
@@ -469,7 +469,7 @@ index 70d3736b..431d4d6f 100644
  import org.yaml.snakeyaml.Yaml;
  import org.yaml.snakeyaml.constructor.Constructor;
  import org.yaml.snakeyaml.introspector.PropertyUtils;
-@@ -178,10 +184,9 @@ public final class PluginManager
+@@ -193,10 +199,9 @@ public final class PluginManager
          }
  
          String[] args = Arrays.copyOfRange( split, 1, split.length );
@@ -481,7 +481,7 @@ index 70d3736b..431d4d6f 100644
                  if ( proxy.getConfig().isLogCommands() )
                  {
                      proxy.getLogger().log( Level.INFO, "{0} executed command: /{1}", new Object[]
-@@ -190,18 +195,28 @@ public final class PluginManager
+@@ -205,18 +210,28 @@ public final class PluginManager
                      } );
                  }
                  command.execute( sender, args );
@@ -513,7 +513,7 @@ index 70d3736b..431d4d6f 100644
          return true;
      }
  
-@@ -289,7 +304,11 @@ public final class PluginManager
+@@ -304,7 +319,11 @@ public final class PluginManager
                  } );
              } catch ( Throwable t )
              {
@@ -526,7 +526,7 @@ index 70d3736b..431d4d6f 100644
              }
          }
      }
-@@ -431,7 +450,7 @@ public final class PluginManager
+@@ -444,7 +463,7 @@ public final class PluginManager
          Preconditions.checkNotNull( event, "event" );
  
          long start = System.nanoTime();
@@ -535,7 +535,7 @@ index 70d3736b..431d4d6f 100644
          event.postCall();
  
          long elapsed = System.nanoTime() - start;
-@@ -445,6 +464,14 @@ public final class PluginManager
+@@ -458,6 +477,14 @@ public final class PluginManager
          return event;
      }
  
@@ -695,5 +695,5 @@ index 67db0cc4..02ec98fc 100644
  
              // If we have a period of 0 or less, only run once
 -- 
-2.27.0
+2.31.0