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

Updated Upstream (BungeeCord) (#574) 

Upstream updated to Netty 4.1.53.Final
Update maven-shade-plugin.log4j2-cachefile-transformer to 2.13.2 for compatibility with maven-shade-plugin 3.2.3
This commit is contained in:
Black Hole 2020-10-23 04:01:15 +02:00 committed by GitHub
parent 27e2885ab3
commit a2d39aed4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit c987ee199d3ec93ce13469deefb1e2787d97147c
Subproject commit 4199b0ca64a63c6e336ed7a9101b37241c7e0449

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

@ -1,4 +1,4 @@
From 7fd6f860c803a268d2967d694d798eeba78dbd68 Mon Sep 17 00:00:00 2001
From 1431e3475927c39123e046e4dfc82005059b3cc8 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
@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
- Deploy to papermc mvn repo
diff --git a/api/pom.xml b/api/pom.xml
index b0220028..6902ba31 100644
index cb49a443..f72ac5c0 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -67,7 +67,7 @@ index b0220028..6902ba31 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index c07793a9..c2826536 100644
index 901d5ae8..22974d80 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -175,7 +175,7 @@ index 8dcde4f2..8523d99a 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 26f25afe..5f4f2b33 100644
index 8a857dfd..099a4643 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -491,7 +491,7 @@ index 8d347068..ec465dd3 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index e482fa86..4112b4e4 100644
index 85ee0687..db1e0722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -606,7 +606,7 @@ index e482fa86..4112b4e4 100644
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
@@ -147,6 +176,7 @@
</dependency>
</dependencies>
@ -858,5 +858,5 @@ index 7d13eb60..1c845a6d 100644
<scope>compile</scope>
</dependency>
--
2.25.1
2.29.0.windows.1

12
BungeeCord-Patches/0029-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From b7b31dfb797e512a5b58b730a2db3f29a05ba775 Mon Sep 17 00:00:00 2001
From 003dd3ac51ed759dc58f9dd52a89fc54be9ff610 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
@ -6,10 +6,10 @@ Subject: [PATCH] Add timeout variant to connect methods
Also added more connect methods to ProxiedPlayer, in addition to the new method
diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
index 867e4428..f7459860 100644
index dadf089b..6e908b74 100644
--- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
+++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
@@ -111,6 +111,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -127,6 +127,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
*/
void connect(ServerInfo target, Callback<Boolean> callback);
@ -48,7 +48,7 @@ index 867e4428..f7459860 100644
/**
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
@@ -124,6 +156,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -140,6 +172,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
*/
void connect(ServerInfo target, Callback<Boolean> callback, ServerConnectEvent.Reason reason);
@ -75,7 +75,7 @@ index 867e4428..f7459860 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index ecde76ec..2c689edf 100644
index b64d3f50..5e3c27a3 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -254,9 +254,20 @@ public final class UserConnection implements ProxiedPlayer
@ -109,5 +109,5 @@ index ecde76ec..2c689edf 100644
{
disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
--
2.26.1
2.29.0.windows.1

12
BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 1f334536d074fd19cbd7228ed93a2cb5e03b6b96 Mon Sep 17 00:00:00 2001
From 39df736127646bf3172ae647b0c50670f2c57327 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index c2826536..a43db907 100644
index 22974d80..0a890393 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -24,14 +24,14 @@ index c2826536..a43db907 100644
</filter>
</filters>
+ <transformers>
+ <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer" />
+ <transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer" />
+ </transformers>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.edwgiz</groupId>
+ <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
+ <version>2.8.1</version>
+ <version>2.13.2</version>
+ </dependency>
+ </dependencies>
</plugin>
@ -233,7 +233,7 @@ index 00000000..93ce3b14
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index 4112b4e4..3ca7ca91 100644
index db1e0722..fd03c640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
@ -458,5 +458,5 @@ index 10366c88..8c5cc949 100644
}
--
2.25.1
2.29.0.windows.1

10
BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,15 +1,15 @@
From 928c66c38d8e49f7d7f94d88c75a52a8e0282057 Mon Sep 17 00:00:00 2001
From 160c7c7c0ddf721253a40fb97aa4abdb6813510a Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml
index 15228459..705b7279 100644
index f72ac5c0..10db38b7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -55,5 +55,11 @@
<version>1.25</version>
<version>1.26</version>
<scope>compile</scope>
</dependency>
+ <!-- Waterfall - Add SLF4J -->
@ -39,7 +39,7 @@ index 9660234d..3d1e9a3a 100644
* Called when the plugin has just been loaded. Most of the proxy will not
* be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml
index a044119e..f5267567 100644
index e49a40ee..1cd12d6a 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -38,6 +38,12 @@
@ -56,5 +56,5 @@ index a044119e..f5267567 100644
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.26.1
2.29.0.windows.1

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

@ -1,4 +1,4 @@
From ff9fcaa0078ec0aed0199371ffd85b2c86dfe60a Mon Sep 17 00:00:00 2001
From e0314827c9cbf1d3ad1554bdf1a92928e420dc02 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
@ -123,10 +123,10 @@ index 2b762d4f..b486f2aa 100644
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
{
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index fae9805c..b0125245 100644
index bc8156cc..7ec119ea 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -745,4 +745,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -753,4 +753,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}
@ -234,5 +234,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.28.0
2.29.0.windows.1

10
BungeeCord-Patches/0048-Use-proper-max-length-for-serverbound-chat-packet.patch
View File

@ -1,4 +1,4 @@
From 6b09cf65b62b9e493e483abfe6f5caa71314cf72 Mon Sep 17 00:00:00 2001
From 07d364ecda023268acd62962e90d9002359437d7 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 20 Mar 2019 21:39:12 -0700
Subject: [PATCH] Use proper max length for serverbound chat packet
@ -44,10 +44,10 @@ index f4470588..4b006833 100644
{
if ( b.length > Short.MAX_VALUE )
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
index b5615a9f..d2a4dea6 100644
index 7a0a1ce7..828a5dbe 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
@@ -35,6 +35,11 @@ public class Chat extends DefinedPacket
@@ -40,6 +40,11 @@ public class Chat extends DefinedPacket
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -59,7 +59,7 @@ index b5615a9f..d2a4dea6 100644
message = readString( buf );
if ( direction == ProtocolConstants.Direction.TO_CLIENT )
{
@@ -49,6 +54,11 @@ public class Chat extends DefinedPacket
@@ -54,6 +59,11 @@ public class Chat extends DefinedPacket
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -72,5 +72,5 @@ index b5615a9f..d2a4dea6 100644
if ( direction == ProtocolConstants.Direction.TO_CLIENT )
{
--
2.24.0
2.29.0.windows.1

22
BungeeCord-Patches/0060-Bump-netty-version.patch
View File

@ -1,22 +0,0 @@
From 2b4366606edf12a1841ae016ce19a8188f38abff Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 27 Sep 2020 18:37:38 +0100
Subject: [PATCH] Bump netty version
diff --git a/pom.xml b/pom.xml
index 3ca7ca91..3ddd74d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
<properties>
<build.number>unknown</build.number>
- <netty.version>4.1.49.Final</netty.version>
+ <netty.version>4.1.52.Final</netty.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--
2.28.0