Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-31 21:18:10 +01: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:
065893b5 Update Netty to 4.1.44.Final and remove usage of some deprecated methods
This commit is contained in:
Shane Freeder 2019-12-21 06:54:52 +00:00
parent 487b632053
commit 6456426ebd
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 4204fa29665b63f551dbe810f2237432cb58e3e1
Subproject commit 065893b5231b4d88a39f2c94c1335d227f5efec9

8
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From aef15f316574d636b1fbf9a205c4406eb7279be5 Mon Sep 17 00:00:00 2001
From d17a85af9c2c799a9032df9c6e7a149c39a72895 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -483,7 +483,7 @@ index f11cad04..f8b549dc 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 8ea1f089..5d5563a0 100644
index 37d4b242..56cf5f31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -578,7 +578,7 @@ index 8ea1f089..5d5563a0 100644
<properties>
<build.number>unknown</build.number>
<netty.version>4.1.43.Final</netty.version>
<netty.version>4.1.44.Final</netty.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- Require Java 8 -->
@ -855,5 +855,5 @@ index 9c7d6f5a..c3a29122 100644
<scope>compile</scope>
</dependency>
--
2.24.0
2.24.1

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

@ -1,4 +1,4 @@
From 06202793582eed6c49ace25a8704089ed05a8b67 Mon Sep 17 00:00:00 2001
From e54d0a29244ada71fe13ab32225f120c799f579e 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 983f4ce6..232f7316 100644
index 60e2889c..d87ceb57 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
@@ -318,6 +318,12 @@ public abstract class EntityMap
@@ -317,6 +317,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;

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

@ -1,4 +1,4 @@
From 1a31a8c4089c1325cb5434d30a52d91ad4d92701 Mon Sep 17 00:00:00 2001
From 9ca8e2ccb7047c10c172b9635aacf01111b86244 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
@ -156,10 +156,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 232f7316..066135ad 100644
index d87ceb57..af27f65c 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
@@ -8,6 +8,7 @@ import io.netty.buffer.ByteBufInputStream;
@@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufInputStream;
import java.io.IOException;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@ -167,7 +167,7 @@ index 232f7316..066135ad 100644
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
@@ -27,6 +28,11 @@ public abstract class EntityMap
@@ -26,6 +27,11 @@ public abstract class EntityMap
// Returns the correct entity map for the protocol version
public static EntityMap getEntityMap(int version)
{
@ -179,7 +179,7 @@ index 232f7316..066135ad 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -278,7 +284,13 @@ public abstract class EntityMap
@@ -277,7 +283,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default: