Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-06-26 14:35:05 +02:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
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:
15204131 #2942: Players invisible in 1.16 where bungee is online mode but IP forwarding not enabled
This commit is contained in:
Shane Freeder 2020-09-15 18:10:05 +01:00
parent 46fa4cf742
commit d1d1b58cf5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 23661737efcfa3d79b5fd28c163e31e8af88003d
Subproject commit 15204131c9d624f930c9cdf6a47b0b0cf12b4327

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

@ -1,4 +1,4 @@
From 4084e0b7a58fd1d1526486140e81746e9b97c2ef Mon Sep 17 00:00:00 2001
From e1787f7073ead26b908679285f5b58d684fa7526 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 99af41b3..69a44db1 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 e20be624..5c54ec21 100644
index c5f45f84..cb94fa4a 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
@@ -316,6 +316,12 @@ public abstract class EntityMap
@@ -321,6 +321,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index e20be624..5c54ec21 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.24.0
2.28.0

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

@ -1,4 +1,4 @@
From 4f9ac58287cdb55b2bcd935dfe4bbc4a2571fdc5 Mon Sep 17 00:00:00 2001
From ff9fcaa0078ec0aed0199371ffd85b2c86dfe60a 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
@ -158,7 +158,7 @@ index 033877fc..72b6e9be 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 5c54ec21..45f4449c 100644
index cb94fa4a..a5acf512 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
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream;
@ -181,7 +181,7 @@ index 5c54ec21..45f4449c 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -278,7 +284,13 @@ public abstract class EntityMap
@@ -283,7 +289,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default: