Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix failed annotations test

Browse Source
This commit is contained in:
William Blake Galbreath
2021-09-04 12:41:01 -05:00
parent e444ad7e61
commit 4e400de498
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
patches/api/0023-ChatColor-conveniences.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences
diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..bf2a3d76c51fd445667291e203909a5df69a7bcb 100644 index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..0aa79a9fbd5861d217a877a36e985e18fba6256f 100644
--- a/src/main/java/org/bukkit/ChatColor.java --- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java +++ b/src/main/java/org/bukkit/ChatColor.java
@@ -2,6 +2,7 @@ package org.bukkit; @@ -2,6 +2,7 @@ package org.bukkit;
@@ -16,7 +16,7 @@ index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..bf2a3d76c51fd445667291e203909a5d
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
@@ -413,4 +414,71 @@ public enum ChatColor { @@ -413,4 +414,72 @@ public enum ChatColor {
BY_CHAR.put(color.code, color); BY_CHAR.put(color.code, color);
} }
} }
@@ -28,7 +28,8 @@ index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..bf2a3d76c51fd445667291e203909a5d
+ * @param str Legacy string + * @param str Legacy string
+ * @return MiniMessage ready string + * @return MiniMessage ready string
+ */ + */
+ public static String toMM(String str) { + @NotNull
+ public static String toMM(@NotNull String str) {
+ StringBuilder sb = new StringBuilder(str); + StringBuilder sb = new StringBuilder(str);
+ Matcher m = STRIP_COLOR_PATTERN.matcher(sb); + Matcher m = STRIP_COLOR_PATTERN.matcher(sb);
+ while (m.find()) { + while (m.find()) {