Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) 

Upstream has released updates that appear 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:
7e47490e Minecraft 1.18.2 support
This commit is contained in:
Shane Freeder 2022-02-28 15:22:42 +00:00
parent 0e326b5bc8
commit 80a64a6f08
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit f4f94d3b56019bb9c02e7a33842dba74e8877b11
Subproject commit 7e47490e7053d110a33a3c86b025af91bd803388

8
BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 89b27bcbab1c8ae157e8025c39ecb50aadf4da07 Mon Sep 17 00:00:00 2001
From dbfa2c6ed3e8d0843dd28523c5ee02f071f9b9fc 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 cd4965df..1069399e 100644
index 7da127fb..6360818c 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
@@ -98,6 +98,16 @@ public class ProtocolConstants
@@ -100,6 +100,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index cd4965df..1069399e 100644
{
--
2.34.0
2.35.1

6
BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From 1b443aab6b802b9a74a94d2a68f4ad2f6e77ce24 Mon Sep 17 00:00:00 2001
From ccd9cbc89900f06d54463678d3647587ec34b112 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 04a3a73c..ef6b3ed6 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 23715f68..7d970ad8 100644
index 75164c67..f87ce538 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
@@ -327,6 +327,12 @@ public abstract class EntityMap
@@ -328,6 +328,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;

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

@ -1,4 +1,4 @@
From 077875d87eb6f03098bcd12615c74b6aab38a68c Mon Sep 17 00:00:00 2001
From 687c783914c5c79bc62ee5fd9df3cb187861b376 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 b5f8c473..01b29247 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 7d970ad8..99ad8b9c 100644
index f87ce538..cda6451d 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 7d970ad8..99ad8b9c 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -289,7 +295,13 @@ public abstract class EntityMap
@@ -290,7 +296,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default: