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:
fe2a39e4 Minecraft 1.14.3-pre4 support
8eb56837 Bundle 1.14.2 translations
This commit is contained in:
Shane Freeder 2019-06-24 18:42:23 +01:00
parent b430974060
commit ba94135bd5
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
5 changed files with 18 additions and 18 deletions

@ -1 +1 @@
Subproject commit 8fda0606118e4b8875ccb2f6b755e0eaa6b0c6d8 Subproject commit fe2a39e4f13aadcd98f08f6394403d066f687e6d

View File

@ -1,15 +1,15 @@
From f81d3c3a3e118e25cae855d6478ae86f9a1883ba Mon Sep 17 00:00:00 2001 From 5c1cb6270415728c909525c5222773ef94faba75 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500 Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants 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 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 e5ecdee5..bf139a34 100644 index af1328d8..66f77531 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -52,6 +52,16 @@ public class ProtocolConstants @@ -54,6 +54,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_14_2 ProtocolConstants.MINECRAFT_1_14_3
); );
+ public static final boolean isBeforeOrEq(int before, int other) + public static final boolean isBeforeOrEq(int before, int other)
@ -26,5 +26,5 @@ index e5ecdee5..bf139a34 100644
{ {
-- --
2.21.0 2.22.0

View File

@ -1,14 +1,14 @@
From fae8d892f44f35dfc160d522255095487c375c85 Mon Sep 17 00:00:00 2001 From 719e279e25eeee7776bc671b039cf71cc4ed5674 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600 Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API Subject: [PATCH] Better unit tests for Chat API
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
index 730370ad..ba261a9a 100644 index 64db54af..51ac3deb 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
@@ -223,6 +223,26 @@ public class ComponentsTest @@ -226,6 +226,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent ); Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
} }
@ -53,5 +53,5 @@ index 7e63488c..e85c55b7 100644
+ } + }
} }
-- --
2.21.0 2.22.0

View File

@ -1,4 +1,4 @@
From b0d4d4022f8866d4da33cc9f86c88125e111aea6 Mon Sep 17 00:00:00 2001 From 694fc81e5e99287f1e5f13e02e1655934538d8ee Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600 Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers Subject: [PATCH] Allow invalid packet ids for forge servers
@ -105,10 +105,10 @@ index e5a63541..644522b1 100644
@Getter @Getter
@NonNull @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 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 43c58d0b..e67c0034 100644 index eb42bd12..43d4d017 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -313,6 +313,12 @@ public abstract class EntityMap @@ -314,6 +314,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet ); int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex; int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index 43c58d0b..e67c0034 100644
{ {
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
-- --
2.21.0 2.22.0

View File

@ -1,4 +1,4 @@
From 986cade2e09a89dc837a876a88ffe3656fc54545 Mon Sep 17 00:00:00 2001 From 7819491c31d95725158715348f133888f9520397 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000 Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting 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 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 e67c0034..45a9686a 100644 index 43d4d017..3855c0b9 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -273,7 +273,13 @@ public abstract class EntityMap @@ -274,7 +274,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet ); DefinedPacket.readVarInt( packet );
break; break;
default: default:
@ -228,5 +228,5 @@ index 00000000..cb81d1dd
+// Waterfall end +// Waterfall end
\ No newline at end of file \ No newline at end of file
-- --
2.21.0 2.22.0