From 7a5b6a53f12bc547a3afb0b6b39c7193b3d059be Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 22 Jan 2023 04:43:10 -0800 Subject: [PATCH] add missing &k code in anvil format regex, closes #1252 --- patches/server/0085-Allow-anvil-colors.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/server/0085-Allow-anvil-colors.patch b/patches/server/0085-Allow-anvil-colors.patch index 239126e3e..c3850219d 100644 --- a/patches/server/0085-Allow-anvil-colors.patch +++ b/patches/server/0085-Allow-anvil-colors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow anvil colors diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 0363d2263b2d6bd6166fa21d7849297e95eddd77..d39b86b90aefab85b92e980f56f690bdfb9da82f 100644 +index 0363d2263b2d6bd6166fa21d7849297e95eddd77..1608c1462ad7aff04530d94c1d206a550f18e625 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java @@ -280,6 +280,54 @@ public class AnvilMenu extends ItemCombinerMenu { @@ -39,7 +39,7 @@ index 0363d2263b2d6bd6166fa21d7849297e95eddd77..d39b86b90aefab85b92e980f56f690bd + //name = name.replaceAll("(?i)&([0-9a-fr])", "\u00a7$1"); + } + if (player.hasPermission("purpur.anvil.format")) { -+ java.util.regex.Matcher matcher = java.util.regex.Pattern.compile("(?i)&([l-or])").matcher(name); ++ java.util.regex.Matcher matcher = java.util.regex.Pattern.compile("(?i)&([k-or])").matcher(name); + while (matcher.find()) { + String match = matcher.group(1); + name = name.replace("&" + match, "\u00a7" + match.toLowerCase(java.util.Locale.ROOT)); @@ -64,7 +64,7 @@ index 0363d2263b2d6bd6166fa21d7849297e95eddd77..d39b86b90aefab85b92e980f56f690bd } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index df1e48e325a6cec03cda2fe7471249f1d93b77f7..ca70fd0cee8c0d8b4c398a8dc12c4f3bbadab665 100644 +index f360115713f765eb173c6df64843bf8cc3be4e3a..2457818f6716c2434f1b178f3c2c396cf03c7bbc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -300,6 +300,13 @@ public class PurpurWorldConfig {