Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 13:15:31 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) (#382)

Browse Source
This commit is contained in:
theminecoder 2019-05-14 12:41:14 +10:00 committed by Zach
parent 4b911e471b
commit b65f2c9395
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 086eb847ec9c44caf3186feea358df6fdd0ad16d Subproject commit 3ec223ec94d02b1578be251cedc600689e43035f

10
BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
View File

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

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

@ -1,4 +1,4 @@
From 08b3cce88edff9daac07631ea584980dfc97462e Mon Sep 17 00:00:00 2001 From 008069833eb7faa5cf1c9928ba9f032c4be7e91f 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 398cd6dd..c1206a3f 100644 index 1eb539a8..372cd5d4 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
@@ -311,6 +311,12 @@ public abstract class EntityMap @@ -312,6 +312,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 398cd6dd..c1206a3f 100644
{ {
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
-- --
2.21.0 2.20.1 (Apple Git-117)

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

@ -1,4 +1,4 @@
From ed90cf41afe60114d1425c26a89a9eddfeb0fafd Mon Sep 17 00:00:00 2001 From 3ffb2a05e63c93c7b41247df5b570b66b5db09af 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 c1206a3f..f1ed6050 100644 index 372cd5d4..6ebbc04b 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
@@ -271,7 +271,13 @@ public abstract class EntityMap @@ -272,7 +272,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.20.1 (Apple Git-117)