From 1ef2528f28a32b4f494f866250315d4e8003f1ee Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 31 Mar 2024 19:13:15 +0100 Subject: [PATCH] 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: 84d0ea73 Minor formatting fixes 0851e391 #3614: Make glist command output hover and clickable 86e6fdf8 Fix lombok induced JavaDoc error 6ab0f5eb #3621: Warn about use of valid chat colors and add test f2247872 #3621: Only serialize valid chat colors to "color" component 82684c7b #3634: Improve chat test code style. c2f73d32 #3634: Micro-optimize chat deserialization --- BungeeCord | 2 +- .../0012-Better-unit-tests-for-Chat-API.patch | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BungeeCord b/BungeeCord index e642b9d..84d0ea7 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit e642b9dde1ebb42003b1a56c98a47138d87cbe06 +Subproject commit 84d0ea73fa84b0a60204bd84fb34f75b993c6494 diff --git a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch index 13ea9bf..12c4825 100644 --- a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch +++ b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch @@ -1,14 +1,14 @@ -From 3c2617145ca0a4c8b87b000f5f2fbbafad753d7d Mon Sep 17 00:00:00 2001 +From 455892a5aa7454f2c3e2fe8b8f6e6d0c6ad71c5d Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 17:36:31 -0600 Subject: [PATCH] Better unit tests for Chat API diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java -index 555dd333..3affad9a 100644 +index 7e14484b..3698762c 100644 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java -@@ -685,6 +685,26 @@ public class ComponentsTest +@@ -696,6 +696,26 @@ public class ComponentsTest assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() ); } @@ -36,12 +36,12 @@ index 555dd333..3affad9a 100644 public void testLoopSimple() { diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java -index 9ec5dcb1..e56c8353 100644 +index 47c06baa..2552a34f 100644 --- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java +++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java @@ -25,4 +25,12 @@ public class TranslatableComponentTest - assertEquals( "Test string with a placeholder", TextComponent.toPlainText( baseComponents ) ); - assertEquals( "§fTest string with §fa§f placeholder", TextComponent.toLegacyText( baseComponents ) ); + assertEquals( "Test string with a placeholder", BaseComponent.toPlainText( baseComponents ) ); + assertEquals( "§fTest string with §fa§f placeholder", BaseComponent.toLegacyText( baseComponents ) ); } + + @Test @@ -53,5 +53,5 @@ index 9ec5dcb1..e56c8353 100644 + } } -- -2.43.0 +2.44.0