From 90dcf9739f7fea6c9c752310ac35af670a4109a0 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 17 Dec 2019 22:37:28 +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:
1f24591a Minecraft 1.15.1 support
---
 BungeeCord                                             |  2 +-
 BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch  | 10 +++++-----
 ...17-Allow-invalid-packet-ids-for-forge-servers.patch |  8 ++++----
 ...-an-option-to-disable-entity-metadata-rewriti.patch |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index 4cccf53..1f24591 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 4cccf53775fc88b008e102bfd6d0cdcc7a044ac0
+Subproject commit 1f24591a0d1b8e746928782e32658b86f066f02d
diff --git a/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
index 228ee93..046f331 100644
--- a/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
+++ b/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
@@ -1,15 +1,15 @@
-From b6ece22debc4e9d518606f51d3fc8d65606632f5 Mon Sep 17 00:00:00 2001
+From 90ec1080b5d3d40a67595d22b0ce262be6d54d66 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 4ba561a4..c34f6fa2 100644
+index b91d191e..20bbd5db 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
-@@ -59,6 +59,16 @@ public class ProtocolConstants
-             ProtocolConstants.MINECRAFT_1_15
+@@ -61,6 +61,16 @@ public class ProtocolConstants
+             ProtocolConstants.MINECRAFT_1_15_1
      );
  
 +    public static final boolean isBeforeOrEq(int before, int other)
@@ -26,5 +26,5 @@ index 4ba561a4..c34f6fa2 100644
      {
  
 -- 
-2.24.0
+2.24.1
 
diff --git a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
index a6e7c51..27dd2f6 100644
--- a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
@@ -1,4 +1,4 @@
-From 6559583460588cb30d956d9db8eae834eb2a9ef5 Mon Sep 17 00:00:00 2001
+From 06202793582eed6c49ace25a8704089ed05a8b67 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 e5a63541..644522b1 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 ff59c824..298a99be 100644
+index 983f4ce6..232f7316 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;
  
@@ -122,5 +122,5 @@ index ff59c824..298a99be 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.24.0
+2.24.1
 
diff --git a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
index a928964..65a07ed 100644
--- a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
+++ b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
@@ -1,4 +1,4 @@
-From 0eba7da12fc8c161aa50d07bfcd616a8acbede73 Mon Sep 17 00:00:00 2001
+From 1a31a8c4089c1325cb5434d30a52d91ad4d92701 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 fd14f518..fba84905 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 298a99be..e5d566bd 100644
+index 232f7316..066135ad 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
 @@ -8,6 +8,7 @@ import io.netty.buffer.ByteBufInputStream;
@@ -179,7 +179,7 @@ index 298a99be..e5d566bd 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:
@@ -232,5 +232,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.24.0
+2.24.1