Skip to content

Commit

Permalink
Updated Upstream (BungeeCord)
Browse files Browse the repository at this point in the history
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:
b23a5182 #3588: Bump org.apache.maven.plugins:maven-compiler-plugin
708c5b62 #3585: Fix mistake converting certain NBT to JSON in previous commit
f5af1119 #3584: Handle conversion of mixed NBT lists to json
b711e403 #3578: bungeecord-chat does not support array format UUIDs
  • Loading branch information
electronicboy committed Dec 28, 2023
1 parent eadd173 commit 333dddf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions BungeeCord-Patches/0001-POM-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9ae84f2bd8435cc04badeccfde4fc367b42f6ca3 Mon Sep 17 00:00:00 2001
From 1ab877cf71af46ba9adbfe08ffe97e84b65898fc Mon Sep 17 00:00:00 2001
From: Tux <[email protected]>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
Expand Down Expand Up @@ -515,7 +515,7 @@ index a4265e54..5e9d29d7 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 6790d07b..3e08cb3c 100644
index b6a01870..d8c23f4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
Expand Down Expand Up @@ -620,7 +620,7 @@ index 6790d07b..3e08cb3c 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
</plugin>
<plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 7f807c4653ad19c7c47a22495b081781ec9fee42 Mon Sep 17 00:00:00 2001
From 2dd0204e7fcbb99832af639ab790a3d7ad783caf Mon Sep 17 00:00:00 2001
From: Tux <[email protected]>
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 5319ecf3..df7cf7c6 100644
index b4595b32..b0698241 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
@@ -666,6 +666,26 @@ public class ComponentsTest
@@ -675,6 +675,26 @@ public class ComponentsTest
assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
}

Expand Down

0 comments on commit 333dddf

Please sign in to comment.