diff --git a/patches/server/0224-Cauldron-fill-chances.patch b/patches/server/0224-Cauldron-fill-chances.patch index 23c356dbd..12dc84e83 100644 --- a/patches/server/0224-Cauldron-fill-chances.patch +++ b/patches/server/0224-Cauldron-fill-chances.patch @@ -18,10 +18,10 @@ index dbae4f3b56d0290c6d28b9beaaa3b459754d43e3..676184c48c3abd8e2fb9a04ae3e165dc @Override diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java -index 356b0cab78966f6b99396975c68042bff3526a9d..f512c958e157be21455adf5680d4c33d8a3dc8f8 100644 +index 995e3bf2ee863902497ab40cb7cf3a14a22a6e19..0499d79e7882ba521f40851ba31b2a44240f40ec 100644 --- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java +++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java -@@ -185,19 +185,19 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate +@@ -187,19 +187,19 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate @VisibleForTesting public static void maybeFillCauldron(BlockState state, ServerLevel world, BlockPos pos, float dripChance) { diff --git a/patches/server/0271-Fix-legacy-colors-in-console.patch b/patches/server/0271-Fix-legacy-colors-in-console.patch new file mode 100644 index 000000000..7b4efdb96 --- /dev/null +++ b/patches/server/0271-Fix-legacy-colors-in-console.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Sun, 13 Mar 2022 21:00:02 -0500 +Subject: [PATCH] Fix legacy colors in console + + +diff --git a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java +index ea83ee8762c126c449993a7497257b0bd8663452..a994fc41efc7e27f1a231b15aaf31628352fbf08 100644 +--- a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java ++++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java +@@ -38,6 +38,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { + private static final String ANSI_RESET = "\u001B[m"; + + private static final char COLOR_CHAR = 0x7f; ++ private static final char LEGACY_CHAR = 0xa7; // Purpur + public static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder() + .hexColors() + .flattener(PaperAdventure.FLATTENER) +@@ -48,6 +49,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { + private static final String RGB_ANSI = "\u001B[38;2;%d;%d;%dm"; + private static final Pattern NAMED_PATTERN = Pattern.compile(COLOR_CHAR + "[0-9a-fk-orA-FK-OR]"); + private static final Pattern RGB_PATTERN = Pattern.compile(COLOR_CHAR + "#([0-9a-fA-F]){6}"); ++ private static final Pattern LEGACY_PATTERN = Pattern.compile(LEGACY_CHAR + "([0-9a-fk-orxA-FK-ORX])"); // Purpur + + private static final String[] RGB_ANSI_CODES = new String[]{ + formatHexAnsi(NamedTextColor.BLACK), // Black ยง0 +@@ -155,6 +157,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { + } + + static void format(String content, StringBuilder result, int start, boolean ansi) { ++ content = LEGACY_PATTERN.matcher(content).replaceAll(COLOR_CHAR + "$1"); // Purpur + int next = content.indexOf(COLOR_CHAR); + int last = content.length() - 1; + if (next == -1 || next == last) {