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:
129884f4 Minecraft 1.15.2 support

BungeeCord

@@ -1 +1 @@
-Subproject commit 4bb0fb67a8ac75d9ceb8e8e815db3478b0cd4799
+Subproject commit 129884f44d950ed97b36e1237dc1a098975c0475

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 5596cf8eeee5006b2584a5ab38bfbf78cc3912c7 Mon Sep 17 00:00:00 2001
+From 52b2476ab289177423fd0c5d4a644eaaf5292b6e 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
@@ -483,7 +483,7 @@ index f11cad04..f8b549dc 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index ff92bf1e..32ef5311 100644
+index 73b51d49..82872150 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -541,7 +541,7 @@ index ff92bf1e..32ef5311 100644
          </developer>
      </developers>
  
-@@ -45,31 +64,36 @@
+@@ -45,23 +64,27 @@
      </modules>
  
      <scm>
@@ -576,18 +576,7 @@ index ff92bf1e..32ef5311 100644
          </snapshotRepository>
      </distributionManagement>
  
-     <properties>
+@@ -118,7 +141,17 @@
-         <build.number>unknown</build.number>
-         <netty.version>4.1.45.Final</netty.version>
--        <maven.compiler.source>1.7</maven.compiler.source>
--        <maven.compiler.target>1.7</maven.compiler.target>
-+        <!-- Require Java 8 -->
-+        <maven.compiler.source>1.8</maven.compiler.source>
-+        <maven.compiler.target>1.8</maven.compiler.target>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     </properties>
- 
-@@ -118,7 +142,17 @@
                      </execution>
                  </executions>
              </plugin>
@@ -605,7 +594,7 @@ index ff92bf1e..32ef5311 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <version>3.1.0</version>
-@@ -143,6 +177,7 @@
+@@ -143,6 +176,7 @@
                      </dependency>
                  </dependencies>
              </plugin>
@@ -613,7 +602,7 @@ index ff92bf1e..32ef5311 100644
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -165,4 +200,87 @@
+@@ -165,4 +199,87 @@
              </plugin>
          </plugins>
      </build>
@@ -743,7 +732,7 @@ index e11af008..4592e2b3 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 97a75125..dbd4c79d 100644
+index 04c5af43..b525340d 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@

BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch

@@ -1,15 +1,15 @@
-From 90ec1080b5d3d40a67595d22b0ce262be6d54d66 Mon Sep 17 00:00:00 2001
+From 35be73ccc5dc4c5a577aef66e610c423c18a8015 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 09:07:51 -0500
 Subject: [PATCH] Fixup ProtocolConstants
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index b91d191e..20bbd5db 100644
+index ad587d28..cd987c8a 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-@@ -61,6 +61,16 @@ public class ProtocolConstants
+@@ -63,6 +63,16 @@ public class ProtocolConstants
-             ProtocolConstants.MINECRAFT_1_15_1
+             ProtocolConstants.MINECRAFT_1_15_2
      );
  
 +    public static final boolean isBeforeOrEq(int before, int other)
@@ -26,5 +26,5 @@ index b91d191e..20bbd5db 100644
      {
  
 -- 
-2.24.1
+2.25.0
 

BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch

@@ -1,4 +1,4 @@
-From 54742637aa0b70247beb96d38797a1675fe63f3b Mon Sep 17 00:00:00 2001
+From 1b1c3dbe43edb753e38f18730b6e6d43bf907d09 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -105,10 +105,10 @@ index aebfdc16..e245c3c0 100644
      @Getter
      @NonNull
 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 60e2889c..d87ceb57 100644
+index 0d7a6d83..ccebd15a 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
-@@ -317,6 +317,12 @@ public abstract class EntityMap
+@@ -318,6 +318,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  

BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch

@@ -1,4 +1,4 @@
-From 4111e1762ca8665c34dc1837c277dbd0b2f68be1 Mon Sep 17 00:00:00 2001
+From 18aafc4693f761f341e062bc42a82cedfa8e6caf Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 14 Jan 2019 03:35:21 +0000
 Subject: [PATCH] Provide an option to disable entity metadata rewriting
@@ -156,7 +156,7 @@ index 708088f3..fe27b406 100644
      }
  
 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 d87ceb57..af27f65c 100644
+index ccebd15a..d2108587 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
 @@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufInputStream;
@@ -179,7 +179,7 @@ index d87ceb57..af27f65c 100644
          switch ( version )
          {
              case ProtocolConstants.MINECRAFT_1_8:
-@@ -277,7 +283,13 @@ public abstract class EntityMap
+@@ -278,7 +284,13 @@ public abstract class EntityMap
                      DefinedPacket.readVarInt( packet );
                      break;
                  default: