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:
8fda0606 Minecraft 1.14.2 support
This commit is contained in:
Shane Freeder 2019-05-28 00:40:07 +01:00
parent b65f2c9395
commit b430974060
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 14 additions and 14 deletions

@ -1 +1 @@
Subproject commit 3ec223ec94d02b1578be251cedc600689e43035f
Subproject commit 8fda0606118e4b8875ccb2f6b755e0eaa6b0c6d8

View File

@ -1,15 +1,15 @@
From 05d1cb48cf1187bb0690f7f9b4761919963ec1bd Mon Sep 17 00:00:00 2001
From f81d3c3a3e118e25cae855d6478ae86f9a1883ba 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 67e212e2..eea7ed98 100644
index e5ecdee5..bf139a34 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
@@ -50,6 +50,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_14_1
@@ -52,6 +52,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_14_2
);
+ public static final boolean isBeforeOrEq(int before, int other)
@ -26,5 +26,5 @@ index 67e212e2..eea7ed98 100644
{
--
2.20.1 (Apple Git-117)
2.21.0

View File

@ -1,4 +1,4 @@
From 008069833eb7faa5cf1c9928ba9f032c4be7e91f Mon Sep 17 00:00:00 2001
From b0d4d4022f8866d4da33cc9f86c88125e111aea6 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 1eb539a8..372cd5d4 100644
index 43c58d0b..e67c0034 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
@@ -312,6 +312,12 @@ public abstract class EntityMap
@@ -313,6 +313,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index 1eb539a8..372cd5d4 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.20.1 (Apple Git-117)
2.21.0

View File

@ -1,4 +1,4 @@
From 3ffb2a05e63c93c7b41247df5b570b66b5db09af Mon Sep 17 00:00:00 2001
From 986cade2e09a89dc837a876a88ffe3656fc54545 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
@ -172,10 +172,10 @@ 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 372cd5d4..6ebbc04b 100644
index e67c0034..45a9686a 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
@@ -272,7 +272,13 @@ public abstract class EntityMap
@@ -273,7 +273,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -228,5 +228,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.20.1 (Apple Git-117)
2.21.0