From fe43b76d7cac4b1d6179b6901fdc5bb93dac0f03 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 28 Feb 2021 19:17:17 +0000 Subject: [PATCH 1/2] Updated Upstream (Waterfall) 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 Waterfall Changes: 57c175c bump log4j version --- Waterfall | 2 +- .../0001-POM-Changes.patch | 46 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Waterfall b/Waterfall index 9a1d6a1..57c175c 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 9a1d6a1711e2ab0615dd0440705a033b7c121675 +Subproject commit 57c175ce7f38b36d89d540425423ac3af156119f diff --git a/Waterfall-Proxy-Patches/0001-POM-Changes.patch b/Waterfall-Proxy-Patches/0001-POM-Changes.patch index ed90d0d..c3c5249 100644 --- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch +++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 676a3f5461fa6f63942a92a5c3eba35f4c0b1084 Mon Sep 17 00:00:00 2001 +From c5ebed82ea418dd7281481f4971080bdc70629e5 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 08:56:43 -0500 Subject: [PATCH] POM Changes diff --git a/api/pom.xml b/api/pom.xml -index c2b55587..1cd99ed3 100644 +index c2b55587d..1cd99ed30 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,41 +5,41 @@ @@ -58,7 +58,7 @@ index c2b55587..1cd99ed3 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index c51531eb..b7f932d4 100644 +index 37c0880cd..139b7ac12 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -5,18 +5,18 @@ @@ -102,7 +102,7 @@ index c51531eb..b7f932d4 100644 org.apache.maven.plugins diff --git a/chat/pom.xml b/chat/pom.xml -index 85309233..5cc62141 100644 +index 853092339..5cc621414 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -5,18 +5,18 @@ @@ -129,7 +129,7 @@ index 85309233..5cc62141 100644 diff --git a/config/pom.xml b/config/pom.xml -index 38db2292..7cdcbd8b 100644 +index 38db2292d..7cdcbd8b3 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -5,18 +5,18 @@ @@ -156,7 +156,7 @@ index 38db2292..7cdcbd8b 100644 diff --git a/event/pom.xml b/event/pom.xml -index 82a411b0..b1a990c9 100644 +index 82a411b08..b1a990c93 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -5,16 +5,16 @@ @@ -181,7 +181,7 @@ index 82a411b0..b1a990c9 100644 + Generic java event dispatching API intended for use with Travertine. diff --git a/log/pom.xml b/log/pom.xml -index 646dbfae..00f7b9c9 100644 +index 646dbfae5..00f7b9c92 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -5,18 +5,18 @@ @@ -217,7 +217,7 @@ index 646dbfae..00f7b9c9 100644 compile diff --git a/log4j/pom.xml b/log4j/pom.xml -index 8baf329b..060a8ec7 100644 +index 51187fd15..9fe7044f9 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -4,18 +4,18 @@ @@ -242,7 +242,7 @@ index 8baf329b..060a8ec7 100644 + Simplistic and performant Log4j2 based logger and console API designed for use with Travertine and Minecraft related applications. - 2.12.0 + 2.14.0 @@ -50,5 +50,24 @@ 3.4.2 runtime @@ -269,7 +269,7 @@ index 8baf329b..060a8ec7 100644 diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml -index 472314c2..8eb06572 100644 +index 472314c2f..8eb065721 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -5,13 +5,13 @@ @@ -289,7 +289,7 @@ index 472314c2..8eb06572 100644 jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml -index de8faee0..09e2835a 100644 +index de8faee02..09e2835aa 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -5,13 +5,13 @@ @@ -309,7 +309,7 @@ index de8faee0..09e2835a 100644 jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml -index 0cab9a7a..5d1ff042 100644 +index 0cab9a7ab..5d1ff0424 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -5,13 +5,13 @@ @@ -329,7 +329,7 @@ index 0cab9a7a..5d1ff042 100644 jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml -index 240c9548..1f6a7c68 100644 +index 240c95487..1f6a7c681 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -5,13 +5,13 @@ @@ -349,7 +349,7 @@ index 240c9548..1f6a7c68 100644 jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml -index 4c13d517..c353e829 100644 +index 4c13d5177..c353e8293 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -5,13 +5,13 @@ @@ -369,7 +369,7 @@ index 4c13d517..c353e829 100644 jar diff --git a/module/pom.xml b/module/pom.xml -index c9849b6c..ca0a9c87 100644 +index c9849b6c1..ca0a9c87d 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -5,18 +5,18 @@ @@ -405,7 +405,7 @@ index c9849b6c..ca0a9c87 100644 compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml -index 45910b0e..d1a2d86c 100644 +index 45910b0e7..d1a2d86c8 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -5,13 +5,13 @@ @@ -425,7 +425,7 @@ index 45910b0e..d1a2d86c 100644 jar diff --git a/native/pom.xml b/native/pom.xml -index db15febb..a2efb5e5 100644 +index db15febbc..a2efb5e52 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -5,18 +5,18 @@ @@ -452,7 +452,7 @@ index db15febb..a2efb5e5 100644 diff --git a/pom.xml b/pom.xml -index fa4dd98d..7757ce6f 100644 +index bfec1abc2..0183f7148 100644 --- a/pom.xml +++ b/pom.xml @@ -5,19 +5,19 @@ @@ -499,7 +499,7 @@ index fa4dd98d..7757ce6f 100644 diff --git a/protocol/pom.xml b/protocol/pom.xml -index 402266ca..993cbca9 100644 +index 402266ca1..993cbca95 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -5,18 +5,18 @@ @@ -535,7 +535,7 @@ index 402266ca..993cbca9 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index 7a872a54..330697bc 100644 +index 7a872a549..330697bc7 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -5,17 +5,17 @@ @@ -597,7 +597,7 @@ index 7a872a54..330697bc 100644 compile diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java -index 338c30d3..c0499252 100644 +index 338c30d35..c04992523 100644 --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java @@ -20,7 +20,7 @@ public class JenkinsModuleSource implements ModuleSource @@ -610,7 +610,7 @@ index 338c30d3..c0499252 100644 version.getBuild(), module.getName() diff --git a/query/pom.xml b/query/pom.xml -index 8ce88f4a..813696e4 100644 +index 8ce88f4a4..813696e45 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -5,18 +5,18 @@ @@ -646,5 +646,5 @@ index 8ce88f4a..813696e4 100644 compile -- -2.30.0 +2.30.1 From 296c62b808252885f882f311093e6cc0c450b313 Mon Sep 17 00:00:00 2001 From: riku6460 <17585784+riku6460@users.noreply.github.com> Date: Fri, 9 Apr 2021 02:56:21 +0900 Subject: [PATCH 2/2] Updated Upstream (Waterfall) (#155) 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 Waterfall Changes: cb25ad5 Updated Upstream (BungeeCord) 4ef9bab Updated Upstream (BungeeCord) 07617c8 Fix further issues with rgb text pattern matching (#615) --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Waterfall b/Waterfall index 57c175c..cb25ad5 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 57c175ce7f38b36d89d540425423ac3af156119f +Subproject commit cb25ad54090277d5d175193352947e692daa269b diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 92e9562..66cc500 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 645dd7b625e6cda74114262e66edec565f7fda58 Mon Sep 17 00:00:00 2001 +From 891ed926bf9e31d97a3c1b166c55666d32531d37 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -1382,7 +1382,7 @@ index 491cf1a1..299a216c 100644 } } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index b486f2aa..c12085e1 100644 +index 2d9c0cda..a4c25575 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufAllocator; @@ -1393,7 +1393,7 @@ index b486f2aa..c12085e1 100644 import java.util.Queue; import java.util.Set; import java.util.UUID; -@@ -268,10 +269,20 @@ public class ServerConnector extends PacketHandler +@@ -270,10 +271,20 @@ public class ServerConnector extends PacketHandler user.getServer().disconnect( "Quitting" ); } else { @@ -1418,7 +1418,7 @@ index b486f2aa..c12085e1 100644 } user.setDimension( login.getDimension() ); -@@ -284,7 +295,7 @@ public class ServerConnector extends PacketHandler +@@ -286,7 +297,7 @@ public class ServerConnector extends PacketHandler if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall for ( Objective objective : serverScoreboard.getObjectives() ) { @@ -1427,7 +1427,7 @@ index b486f2aa..c12085e1 100644 } for ( Score score : serverScoreboard.getScores() ) { -@@ -454,6 +465,14 @@ public class ServerConnector extends PacketHandler +@@ -456,6 +467,14 @@ public class ServerConnector extends PacketHandler { this.handshakeHandler.handle( pluginMessage ); @@ -2010,5 +2010,5 @@ index daf12f74..e33861ab 100644 @Override -- -2.30.0 +2.25.1