From bc3e393b1419a2f0a350a746e8595deecc934d86 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 22 Feb 2021 16:45:35 +0000
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:
4f23b49f #3037: Update ProxiedPlayer#setDisplayName javadoc to current behaviour
cfcc8b1a Pin GitHub workflow build to ubuntu-20.04
ebec582c Add full support for building on JDK [8, 14]
---
 BungeeCord                                    |  2 +-
 BungeeCord-Patches/0001-POM-Changes.patch     | 22 +++++++++++--------
 ...d-timeout-variant-to-connect-methods.patch | 10 ++++-----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index 3d701fb..4f23b49 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 3d701fbe0ec690d83c10487c57e7dbff353fb0d7
+Subproject commit 4f23b49fef8d30e0f1bdc045575e757ee0d2506f
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index b9e5300..289afc2 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From f2cb918e20677ae75ff1683781ccf6f79949ec6d Mon Sep 17 00:00:00 2001
+From 1a7b13583c9cc431b208154a0a561caa3b40d020 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -67,7 +67,7 @@ index a502e8c3..0eb61e1d 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 99173dbc..7e6a4f39 100644
+index 39816e7b..1bea329d 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,39 +4,40 @@
@@ -491,7 +491,7 @@ index cf46174c..db15febb 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index b077a506..cc177f38 100644
+index 472ba2d5..337a87da 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -588,15 +588,19 @@ index b077a506..cc177f38 100644
      </distributionManagement>
  
      <properties>
-@@ -122,7 +137,17 @@
+@@ -122,12 +137,21 @@
                      </execution>
                  </executions>
              </plugin>
 +            <!-- Use latest version of the javadoc plugin, fixes some issues with the javadoc tool on recent JDK builds on macOS at least -->
              <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <version>3.8.1</version>
+             </plugin>
+             <plugin>
 +                <artifactId>maven-javadoc-plugin</artifactId>
-+                <version>3.1.0</version>
++                <version>3.2.0</version>
 +                <configuration>
 +                    <doclint>none</doclint>
 +                </configuration>
@@ -606,7 +610,7 @@ index b077a506..cc177f38 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <version>3.1.1</version>
-@@ -147,6 +172,7 @@
+@@ -152,6 +176,7 @@
                      </dependency>
                  </dependencies>
              </plugin>
@@ -614,7 +618,7 @@ index b077a506..cc177f38 100644
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -260,5 +286,88 @@
+@@ -293,5 +318,88 @@
                  </plugins>
              </build>
          </profile>
@@ -857,5 +861,5 @@ index 3023d072..8ce88f4a 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.25.1
+2.30.1
 
diff --git a/BungeeCord-Patches/0029-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0029-Add-timeout-variant-to-connect-methods.patch
index 8105e99..5a06f2a 100644
--- a/BungeeCord-Patches/0029-Add-timeout-variant-to-connect-methods.patch
+++ b/BungeeCord-Patches/0029-Add-timeout-variant-to-connect-methods.patch
@@ -1,4 +1,4 @@
-From 003dd3ac51ed759dc58f9dd52a89fc54be9ff610 Mon Sep 17 00:00:00 2001
+From 25186c0c59869f42e614e18822a1fe2c344e0009 Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <joe@ibj.io>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
@@ -6,10 +6,10 @@ Subject: [PATCH] Add timeout variant to connect methods
 Also added more connect methods to ProxiedPlayer, in addition to the new method
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
-index dadf089b..6e908b74 100644
+index 29a4716f..3dc32801 100644
 --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
 +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
-@@ -127,6 +127,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
+@@ -126,6 +126,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
       */
      void connect(ServerInfo target, Callback<Boolean> callback);
  
@@ -48,7 +48,7 @@ index dadf089b..6e908b74 100644
      /**
       * Connects / transfers this user to the specified connection, gracefully
       * closing the current one. Depending on the implementation, this method
-@@ -140,6 +172,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
+@@ -139,6 +171,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
       */
      void connect(ServerInfo target, Callback<Boolean> callback, ServerConnectEvent.Reason reason);
  
@@ -109,5 +109,5 @@ index b64d3f50..5e3c27a3 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
 -- 
-2.29.0.windows.1
+2.30.1