diff --git a/patches/api/0016-ChatColor-conveniences.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/ChatColor.java.patch similarity index 85% rename from patches/api/0016-ChatColor-conveniences.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/ChatColor.java.patch index bf0bd59b4..a9da296b0 100644 --- a/patches/api/0016-ChatColor-conveniences.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/ChatColor.java.patch @@ -1,19 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Fri, 10 Jul 2020 12:43:25 -0500 -Subject: [PATCH] ChatColor conveniences - - -diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java -index 918a045165cdcde264bc24082b7afebb407271de..e98d6321c5f2cdde91b54f8a74cbcc045eae75a8 100644 --- a/src/main/java/org/bukkit/ChatColor.java +++ b/src/main/java/org/bukkit/ChatColor.java -@@ -456,4 +456,77 @@ public enum ChatColor { +@@ -456,4 +_,77 @@ BY_CHAR.put(color.code, color); } } + -+ // Purpur start ++ // Purpur start - ChatColor conveniences + /** + * Convert legacy string into a string ready to be parsed by MiniMessage + * @@ -84,5 +76,5 @@ index 918a045165cdcde264bc24082b7afebb407271de..e98d6321c5f2cdde91b54f8a74cbcc04 + public static String color(@Nullable String str, boolean parseHex) { + return str != null ? net.md_5.bungee.api.ChatColor.translateAlternateColorCodes('&', parseHex ? replaceHex(str) : str) : str; + } -+ // Purpur end ++ // Purpur end - ChatColor conveniences }