From 32b7926e7092c24b6ed04f0f88d31cc96bded508 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 11 Oct 2020 00:54:15 -0500 Subject: [PATCH] Fix #77 and credit correct author --- ...rPR-Add-hex-color-code-support-for-console-loggi.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch b/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch index cb0ba640d..236347407 100644 --- a/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch +++ b/patches/server/0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sun, 20 Sep 2020 12:25:18 -0500 +From: Esophose +Date: Thu, 27 Aug 2020 12:25:18 -0500 Subject: [PATCH] PaperPR - Add hex color code support for console logging diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java -index 685deaa0e5..73c2bdd587 100644 +index 685deaa0e5..af8bf0fe23 100644 --- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -1,17 +1,52 @@ @@ -27,7 +27,7 @@ index 685deaa0e5..73c2bdd587 100644 private static final Logger LOGGER = LogManager.getRootLogger(); + private static final char ANSI_ESC_CHAR = '\u001B'; + private static final String RGB_STRING = ANSI_ESC_CHAR + "[38;2;%d;%d;%dm"; -+ private static final String ANSI_RESET = ANSI_ESC_CHAR + "[0m"; ++ private static final String ANSI_RESET = ANSI_ESC_CHAR + "[m"; + private static final Pattern HEX_PATTERN = Pattern.compile("(?i)(" + ChatColor.COLOR_CHAR + "x(" + ChatColor.COLOR_CHAR + "[0-9a-f]){6})"); + private static final boolean keepFormatting = PropertiesUtil.getProperties().getBooleanProperty(MinecraftFormattingConverter.KEEP_FORMATTING_PROPERTY);