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

Updated Upstream (BungeeCord)

Browse Source 
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:
77907839 #3436, #3441: Check if server icon image is null
f4534c82 #3446: Fix < 1.19 support
76673f02 Apply dependabot configuration
b47ae094 #3444: Use same duplicate player handling for online and offline modes
This commit is contained in:
Shane Freeder 2023-03-15 18:37:00 +00:00
parent f26b0ffb69
commit 29849ac41f
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
6 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit f9712cbc7c9ec6295e4a5a646ead1dd0f2d7ed1a
Subproject commit 7790783949fdb43555634d1eab232b0d6dbb6074

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

@ -1,4 +1,4 @@
From abc4f5238300424500831e6ae531163cb82fda2a Mon Sep 17 00:00:00 2001
From 921905301dbe44a7c95763e1114227fcb131295c 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 f49db317..863c353e 100644
index 81179f0f..a680e7b0 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -476,7 +476,7 @@ index 4f3332dd..8aff53bd 100644
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/native/pom.xml b/native/pom.xml
index f7773d80..caa4c4cb 100644
index c7478c96..e137dfcc 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -506,7 +506,7 @@ index f7773d80..caa4c4cb 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 00ec645a..57e35818 100644
index f9aa2c69..4c4597f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -603,7 +603,7 @@ index 00ec645a..57e35818 100644
</distributionManagement>
<properties>
@@ -124,12 +139,21 @@
@@ -134,12 +149,21 @@
</execution>
</executions>
</plugin>
@ -625,7 +625,7 @@ index 00ec645a..57e35818 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.1</version>
@@ -154,6 +178,7 @@
@@ -164,6 +188,7 @@
</dependency>
</dependencies>
</plugin>
@ -633,7 +633,7 @@ index 00ec645a..57e35818 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -290,6 +315,7 @@
@@ -300,6 +325,7 @@
<!-- lombok does not add @return or @param which causes warnings, so ignore -->
<doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath>
@ -641,7 +641,7 @@ index 00ec645a..57e35818 100644
</configuration>
</execution>
</executions>
@@ -321,5 +347,88 @@
@@ -331,5 +357,88 @@
</plugins>
</build>
</profile>
@ -731,7 +731,7 @@ index 00ec645a..57e35818 100644
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index de6bd2e0..93ae5952 100644
index bb2b14fc..221469b9 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -772,7 +772,7 @@ index de6bd2e0..93ae5952 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 7ef05886..eadd8464 100644
index 3a8aaa35..5135c0fd 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -799,7 +799,7 @@ index 7ef05886..eadd8464 100644
<description>Proxy component of the Elastic Portal Suite</description>
<properties>
@@ -57,32 +57,32 @@
@@ -52,32 +52,32 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -843,7 +843,7 @@ index 7ef05886..eadd8464 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 5ea69b24..72eb14e2 100644
index 90a4c8d5..81af5457 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -872,7 +872,7 @@ index 5ea69b24..72eb14e2 100644
<dependencies>
<dependency>
@@ -26,8 +26,8 @@
@@ -25,8 +25,8 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -884,5 +884,5 @@ index 5ea69b24..72eb14e2 100644
<scope>compile</scope>
</dependency>
--
2.37.3.windows.1
2.17.2 (Apple Git-113)

8
BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
View File

@ -1,14 +1,14 @@
From b526187ee2b182930850ced2708a2770b669c949 Mon Sep 17 00:00:00 2001
From f090bbf4ac1184c000210d21a7485c3cb7f24b13 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 18 Jul 2018 20:23:03 +0300
Subject: [PATCH] Copy license files into jar
diff --git a/proxy/pom.xml b/proxy/pom.xml
index cf0a6a99..1d370c70 100644
index 5135c0fd..233c6aae 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -124,4 +124,26 @@
@@ -119,4 +119,26 @@
<scope>runtime</scope>
</dependency>
</dependencies>
@ -36,5 +36,5 @@ index cf0a6a99..1d370c70 100644
+ <!-- Waterfall end -->
</project>
--
2.37.1
2.17.2 (Apple Git-113)

12
BungeeCord-Patches/0032-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From 877cbb5ce3cc8190f8bd2c0378cdca0f6ba54d48 Mon Sep 17 00:00:00 2001
From c9bd6b4fc34e508d86cfc04bb5adec3f33a56f38 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -24,24 +24,22 @@ index 749059ab..6141128b 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 0cd347d8..526617e0 100644
index 233c6aae..54061ec5 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -36,6 +36,20 @@
<version>${netty.version}</version>
@@ -34,6 +34,18 @@
<artifactId>netty-codec-http</artifactId>
<scope>compile</scope>
</dependency>
+ <!-- Waterfall Start - add Netty DNS resolver -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <version>${netty.version}</version>
+ <classifier>osx-x86_64</classifier>
+ </dependency>
+ <!-- Waterfall End -->
@ -177,5 +175,5 @@ index e0c52f21..37337429 100644
+ // Waterfall End
}
--
2.30.1 (Apple Git-130)
2.17.2 (Apple Git-113)

20
BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 155bccab3c402436976b06c0a4472b1a0c42a348 Mon Sep 17 00:00:00 2001
From a2df44ccb6547ae27c8bcd67d7628e461cdbb8e1 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 bcf23a93..232b90b2 100644
index c988cf5d..0c510f9f 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -233,7 +233,7 @@ index 00000000..cfd039cd
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index 5afd8b9c..130670bb 100644
index 4c4597f6..7ff4a013 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,11 +56,12 @@
@ -251,10 +251,10 @@ index 5afd8b9c..130670bb 100644
</modules>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index c726cb18..1036a2e7 100644
index 54061ec5..d3801c9b 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -78,7 +78,7 @@
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>io.github.waterfallmc</groupId>
@ -263,7 +263,7 @@ index c726cb18..1036a2e7 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -100,12 +100,13 @@
@@ -93,12 +93,13 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@ -278,7 +278,7 @@ index c726cb18..1036a2e7 100644
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
@@ -137,6 +138,25 @@
@@ -130,6 +131,25 @@
<version>1.7.3</version>
<scope>runtime</scope>
</dependency>
@ -549,7 +549,7 @@ index 7e465924..00000000
-</project-shared-configuration>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
deleted file mode 100644
index b995ba85..00000000
index 1716c3cf..00000000
--- a/slf4j/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
@ -583,7 +583,7 @@ index b995ba85..00000000
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.32</version>
- <version>1.7.36</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
@ -1617,5 +1617,5 @@ index 21a48df6..00000000
-
-}
--
2.39.1
2.17.2 (Apple Git-113)

8
BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,14 +1,14 @@
From f1adfb64276cd2b876c75262bde597eae55ab5a5 Mon Sep 17 00:00:00 2001
From f5fe955f7406c4778aeeae08ca0624d2c0b6fa12 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 863c353e..5d21fd99 100644
index a680e7b0..6774bed3 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -76,5 +76,11 @@
@@ -75,5 +75,11 @@
<version>1.33</version>
<scope>compile</scope>
</dependency>
@ -56,5 +56,5 @@ index 44bf7f91..fb091698 100644
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.38.1
2.17.2 (Apple Git-113)